[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.3,1.4 class.bo
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.3,1.4 class.bopage.inc.php,1.2,1.3 class.bosite.inc.php,1.2,1.3 class.soelement.inc.php,1.7,1.8 class.sopage.inc.php,1.7,1.8 class.uielement.inc.php,1.5,1.6 class.uipage.inc.php,1.8,1.9 class.uisite.inc.php,1.3,1.4 |
|
Date: |
Wed, 13 Feb 2002 20:04:15 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv13664
Modified Files:
class.boelement.inc.php class.bopage.inc.php
class.bosite.inc.php class.soelement.inc.php
class.sopage.inc.php class.uielement.inc.php
class.uipage.inc.php class.uisite.inc.php
Log Message:
Return ???_id also
Index: class.boelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.boelement.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.boelement.inc.php 10 Feb 2002 18:21:10 -0000 1.3
--- class.boelement.inc.php 14 Feb 2002 01:04:12 -0000 1.4
***************
*** 140,144 ****
else
{
! return $this->so->add($element_info);
}
}
--- 140,145 ----
else
{
! $id = $this->so->add($element_info);
! return $this->so->read($id);
}
}
Index: class.bopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bopage.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bopage.inc.php 4 Feb 2002 01:42:41 -0000 1.2
--- class.bopage.inc.php 14 Feb 2002 01:04:13 -0000 1.3
***************
*** 123,127 ****
else
{
! return $this->so->add($page_info);
}
}
--- 123,128 ----
else
{
! $id = $this->so->add($page_info);
! return $this->so->read($id);
}
}
Index: class.bosite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.bosite.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bosite.inc.php 3 Feb 2002 17:37:38 -0000 1.2
--- class.bosite.inc.php 14 Feb 2002 01:04:13 -0000 1.3
***************
*** 123,127 ****
else
{
! return $this->so->add($site_info);
}
}
--- 123,128 ----
else
{
! $id = $this->so->add($site_info);
! return $this->so->read($id);
}
}
Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.soelement.inc.php 10 Feb 2002 18:21:10 -0000 1.7
--- class.soelement.inc.php 14 Feb 2002 01:04:13 -0000 1.8
***************
*** 98,101 ****
--- 98,102 ----
if($GLOBALS['phpgw']->db->next_record())
{
+ $this->element['element_id'] =
$GLOBALS['phpgw']->db->f('element_id');
$this->element['element_name'] =
$GLOBALS['phpgw']->db->f('element_name');
$this->element['element_title'] =
$GLOBALS['phpgw']->db->f('element_title');
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.sopage.inc.php 11 Feb 2002 02:51:41 -0000 1.7
--- class.sopage.inc.php 14 Feb 2002 01:04:13 -0000 1.8
***************
*** 67,70 ****
--- 67,71 ----
if($GLOBALS['phpgw']->db->next_record())
{
+ $this->page['page_id'] =
$GLOBALS['phpgw']->db->f('page_id');
$this->page['page_name'] =
$GLOBALS['phpgw']->db->f('page_name');
$this->page['page_title'] =
$GLOBALS['phpgw']->db->f('page_title');
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uielement.inc.php 11 Feb 2002 02:51:41 -0000 1.5
--- class.uielement.inc.php 14 Feb 2002 01:04:13 -0000 1.6
***************
*** 223,227 ****
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['element_name']);
!
if($tmp && !$element_id)
{
--- 223,227 ----
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['element_name']);
!
if($tmp && !$element_id)
{
***************
*** 249,252 ****
--- 249,253 ----
}
$element =
$this->bo->edit($element_info);
+ $element_id = $element['element_id'];
}
}
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uipage.inc.php 11 Feb 2002 02:51:41 -0000 1.8
--- class.uipage.inc.php 14 Feb 2002 01:04:13 -0000 1.9
***************
*** 284,287 ****
--- 284,288 ----
}
$page = $this->bo->edit($page_info);
+ $page_id = $page['page_id'];
}
}
Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uisite.inc.php 4 Feb 2002 02:32:51 -0000 1.3
--- class.uisite.inc.php 14 Feb 2002 01:04:13 -0000 1.4
***************
*** 194,198 ****
$GLOBALS['phpgw']->template->set_block('form','page','pagehandle');
! $site =
$this->bo->read($GLOBALS['HTTP_GET_VARS']['site_id']);
if($GLOBALS['HTTP_POST_VARS']['addpage'])
--- 194,199 ----
$GLOBALS['phpgw']->template->set_block('form','page','pagehandle');
! $site_id = $GLOBALS['HTTP_POST_VARS']['site_id'] ?
$GLOBALS['HTTP_POST_VARS']['site_id'] : $GLOBALS['HTTP_GET_VARS']['site_id'];
! $site = $this->bo->read($site_id);
if($GLOBALS['HTTP_POST_VARS']['addpage'])
***************
*** 200,204 ****
$site['site_pages'][] = '';
}
! if ($GLOBALS['HTTP_POST_VARS']['submit'])
{
//_debug_array($GLOBALS['HTTP_POST_VARS']);
--- 201,205 ----
$site['site_pages'][] = '';
}
! if($GLOBALS['HTTP_POST_VARS']['submit'])
{
//_debug_array($GLOBALS['HTTP_POST_VARS']);
***************
*** 207,216 ****
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['site_name']);
! if($tmp &&
$GLOBALS['HTTP_POST_VARS']['site_id'])
{
$error[$errorcount++] = lang('That site
name has been used already !');
}
! if (!$GLOBALS['HTTP_POST_VARS']['site_name'])
{
$error[$errorcount++] = lang('Please
enter a name for that site !');
--- 208,217 ----
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['site_name']);
! if($tmp && !$site_id)
{
$error[$errorcount++] = lang('That site
name has been used already !');
}
! if(!$GLOBALS['HTTP_POST_VARS']['site_name'])
{
$error[$errorcount++] = lang('Please
enter a name for that site !');
***************
*** 244,251 ****
if($GLOBALS['HTTP_GET_VARS']['site_id'])
{
! $site_info['site_id'] =
$GLOBALS['HTTP_GET_VARS']['site_id'];
}
! $newid = $this->bo->edit($site_info);
! $site = $this->bo->read($newid ? $newid
: $site_info['site_id']);
}
}
--- 245,252 ----
if($GLOBALS['HTTP_GET_VARS']['site_id'])
{
! $site_info['site_id'] =
$site_id;
}
! $site = $this->bo->edit($site_info);
! $site_id = $site['site_id'];
}
}
***************
*** 275,280 ****
$GLOBALS['phpgw']->template->set_var('title_sites',$GLOBALS['HTTP_GET_VARS']['site_id']
? lang('Edit Website') : lang('Add Website'));
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
. $GLOBALS['HTTP_GET_VARS']['site_id']));
!
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
. $GLOBALS['HTTP_GET_VARS']['site_id']));
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
--- 276,281 ----
$GLOBALS['phpgw']->template->set_var('title_sites',$GLOBALS['HTTP_GET_VARS']['site_id']
? lang('Edit Website') : lang('Add Website'));
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
. $site_id));
!
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.delete&site_id='
. $site_id));
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.index'));
***************
*** 309,313 ****
$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($site['admin_name']));
$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($site['admin_email']));
!
$GLOBALS['phpgw']->template->set_var('site_id',$GLOBALS['HTTP_GET_VARS']['site_id']
? $GLOBALS['HTTP_GET_VARS']['site_id'] : $site['site_id']);
$GLOBALS['phpgw']->template->set_var('site_header',$site['site_header']);
$GLOBALS['phpgw']->template->set_var('site_footer',$site['site_footer']);
--- 310,314 ----
$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($site['admin_name']));
$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($site['admin_email']));
!
$GLOBALS['phpgw']->template->set_var('site_id',$site_id);
$GLOBALS['phpgw']->template->set_var('site_header',$site['site_header']);
$GLOBALS['phpgw']->template->set_var('site_footer',$site['site_footer']);
***************
*** 335,339 ****
$GLOBALS['phpgw']->template->set_var('pagehandle','');
! if(isset($site['site_id']) ||
$GLOBALS['HTTP_GET_VARS']['site_id'])
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
--- 336,340 ----
$GLOBALS['phpgw']->template->set_var('pagehandle','');
! if(isset($site['site_id']) || $site_id)
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.3,1.4 class.bopage.inc.php,1.2,1.3 class.bosite.inc.php,1.2,1.3 class.soelement.inc.php,1.7,1.8 class.sopage.inc.php,1.7,1.8 class.uielement.inc.php,1.5,1.6 class.uipage.inc.php,1.8,1.9 class.uisite.inc.php,1.3,1.4,
Miles Lott <address@hidden> <=