[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.6,1.7 class.uiele
|
From: |
Miles Lott <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.6,1.7 class.uielement.inc.php,1.4,1.5 class.uipage.inc.php,1.7,1.8 |
|
Date: |
Sun, 10 Feb 2002 21:51:46 -0500 |
Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv18948/inc
Modified Files:
class.sopage.inc.php class.uielement.inc.php
class.uipage.inc.php
Log Message:
page and element edit should now save the id...
Index: class.sopage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.sopage.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.sopage.inc.php 10 Feb 2002 18:21:10 -0000 1.6
--- class.sopage.inc.php 11 Feb 2002 02:51:41 -0000 1.7
***************
*** 119,123 ****
. "WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
! return True;
}
return False;
--- 119,123 ----
. "WHERE page_id=" . intval($pageid);
$GLOBALS['phpgw']->db->query($sql,__LINE__,__FILE__);
! return $pageid;
}
return False;
Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uielement.inc.php 10 Feb 2002 18:21:10 -0000 1.4
--- class.uielement.inc.php 11 Feb 2002 02:51:41 -0000 1.5
***************
*** 213,217 ****
$GLOBALS['phpgw']->template->set_block('form','file','filehandle');
! $element =
$this->bo->read($GLOBALS['HTTP_GET_VARS']['element_id']);
$element['element_type'] =
$GLOBALS['HTTP_POST_VARS']['element_type'] ?
$GLOBALS['HTTP_POST_VARS']['element_type'] : $element['element_type'];
--- 213,219 ----
$GLOBALS['phpgw']->template->set_block('form','file','filehandle');
! $element_id = $GLOBALS['HTTP_POST_VARS']['element_id']
? $GLOBALS['HTTP_POST_VARS']['element_id'] :
$GLOBALS['HTTP_GET_VARS']['element_id'];
!
! $element = $this->bo->read($element_id);
$element['element_type'] =
$GLOBALS['HTTP_POST_VARS']['element_type'] ?
$GLOBALS['HTTP_POST_VARS']['element_type'] : $element['element_type'];
***************
*** 222,226 ****
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['element_name']);
! if($tmp &&
$GLOBALS['HTTP_POST_VARS']['element_id'])
{
$error[$errorcount++] = lang('That
element name has been used already !');
--- 224,228 ----
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['element_name']);
! if($tmp && !$element_id)
{
$error[$errorcount++] = lang('That
element name has been used already !');
***************
*** 242,251 ****
'element_version' =>
$element['element_version']
);
!
if($GLOBALS['HTTP_GET_VARS']['element_id'])
{
! $element_info['element_id'] =
$GLOBALS['HTTP_GET_VARS']['element_id'];
}
! $newid = $this->bo->edit($element_info);
! $element = $this->bo->read($newid ?
$newid : $element_info['element_id']);
}
}
--- 244,252 ----
'element_version' =>
$element['element_version']
);
! if($element_id)
{
! $element_info['element_id'] =
$element_id;
}
! $element =
$this->bo->edit($element_info);
}
}
***************
*** 320,324 ****
case 4:
/* hook */
! $_type =
$this->formatted_list('element_source',$this->bo->app_list(),$id=$element['element_source']);
$GLOBALS['phpgw']->template->set_var('multipart','');
$_file = '';
--- 321,325 ----
case 4:
/* hook */
! $_type =
$this->formatted_list('element_source',$this->bo->app_list(),$element['element_source']);
$GLOBALS['phpgw']->template->set_var('multipart','');
$_file = '';
***************
*** 340,344 ****
$GLOBALS['phpgw']->template->set_var('element_file',$_file);
!
$GLOBALS['phpgw']->template->set_var('element_id',$GLOBALS['HTTP_GET_VARS']['element_id']
? $GLOBALS['HTTP_GET_VARS']['element_id'] : $element['element_id']);
$GLOBALS['phpgw']->template->set_var('element_version',$element['element_version']);
$GLOBALS['phpgw']->template->set_var('pages','');
--- 341,345 ----
$GLOBALS['phpgw']->template->set_var('element_file',$_file);
!
$GLOBALS['phpgw']->template->set_var('element_id',$element_id);
$GLOBALS['phpgw']->template->set_var('element_version',$element['element_version']);
$GLOBALS['phpgw']->template->set_var('pages','');
***************
*** 348,352 ****
$GLOBALS['phpgw']->template->set_var('filehandle','');
! if(isset($element['element_id']) ||
$GLOBALS['HTTP_GET_VARS']['element_id'])
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
--- 349,353 ----
$GLOBALS['phpgw']->template->set_var('filehandle','');
! if(isset($element['element_id']) || $element_id)
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uipage.inc.php 10 Feb 2002 18:21:10 -0000 1.7
--- class.uipage.inc.php 11 Feb 2002 02:51:41 -0000 1.8
***************
*** 238,244 ****
$GLOBALS['phpgw']->template->set_block('form','elem','elementhandle');
! $page =
$this->bo->read($GLOBALS['HTTP_GET_VARS']['page_id']);
! if ($GLOBALS['HTTP_POST_VARS']['submit'])
{
$errorcount = 0;
--- 238,245 ----
$GLOBALS['phpgw']->template->set_block('form','elem','elementhandle');
! $page_id = $GLOBALS['HTTP_POST_VARS']['page_id'] ?
$GLOBALS['HTTP_POST_VARS']['page_id'] : $GLOBALS['HTTP_GET_VARS']['page_id'];
! $page = $this->bo->read($page_id);
! if($GLOBALS['HTTP_POST_VARS']['submit'])
{
$errorcount = 0;
***************
*** 246,260 ****
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['page_name']);
! if($tmp &&
$GLOBALS['HTTP_POST_VARS']['page_id'])
{
$error[$errorcount++] = lang('That page
name has been used already !');
}
! if (!$GLOBALS['HTTP_POST_VARS']['page_name'])
{
$error[$errorcount++] = lang('Please
enter a name for that page !');
}
! if (!$error)
{
$page_info = array(
--- 247,261 ----
$tmp =
$this->bo->name2id($GLOBALS['HTTP_POST_VARS']['page_name']);
! if($tmp && !$page_id)
{
$error[$errorcount++] = lang('That page
name has been used already !');
}
! if(!$GLOBALS['HTTP_POST_VARS']['page_name'])
{
$error[$errorcount++] = lang('Please
enter a name for that page !');
}
! if(!$error)
{
$page_info = array(
***************
*** 278,287 ****
'page_version' =>
$page['page_version']
);
! if($GLOBALS['HTTP_GET_VARS']['page_id'])
{
! $page_info['page_id'] =
$GLOBALS['HTTP_GET_VARS']['page_id'];
}
! $newid = $this->bo->edit($page_info);
! $page = $this->bo->read($newid ? $newid
: $page_info['page_id']);
}
}
--- 279,287 ----
'page_version' =>
$page['page_version']
);
! if($page_id)
{
! $page_info['page_id'] =
$page_id;
}
! $page = $this->bo->edit($page_info);
}
}
***************
*** 293,297 ****
if (($GLOBALS['HTTP_POST_VARS']['submit']) && (!$error)
&& (!$errorcount))
{
! if($GLOBALS['HTTP_GET_VARS']['page_id'])
{
$GLOBALS['phpgw']->template->set_var('message',lang('Page x has been
updated',$page_name));
--- 293,297 ----
if (($GLOBALS['HTTP_POST_VARS']['submit']) && (!$error)
&& (!$errorcount))
{
! if($page_info['page_id'])
{
$GLOBALS['phpgw']->template->set_var('message',lang('Page x has been
updated',$page_name));
***************
*** 313,319 ****
//_debug_array($page);
!
$GLOBALS['phpgw']->template->set_var('title_pages',$GLOBALS['HTTP_GET_VARS']['page_id']
? lang('Edit Webpage') : lang('Add Webpage'));
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.edit&page_id='
. $GLOBALS['HTTP_GET_VARS']['page_id']));
!
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.delete&page_id='
. $GLOBALS['HTTP_GET_VARS']['page_id']));
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
--- 313,319 ----
//_debug_array($page);
!
$GLOBALS['phpgw']->template->set_var('title_pages',$page_id ? lang('Edit
Webpage') : lang('Add Webpage'));
!
$GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.edit&page_id='
. $page_id));
!
$GLOBALS['phpgw']->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.delete&page_id='
. $page_id));
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uipage.index'));
***************
*** 347,351 ****
$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($page['admin_name']));
$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($page['admin_email']));
!
$GLOBALS['phpgw']->template->set_var('page_id',$GLOBALS['HTTP_GET_VARS']['page_id']
? $GLOBALS['HTTP_GET_VARS']['page_id'] : $page['page_id']);
$GLOBALS['phpgw']->template->set_var('page_pages',$page['page_pages']);
$headers = $this->boelements->list_headers(True);
--- 347,351 ----
$GLOBALS['phpgw']->template->set_var('admin_name',$GLOBALS['phpgw']->strip_html($page['admin_name']));
$GLOBALS['phpgw']->template->set_var('admin_email',$GLOBALS['phpgw']->strip_html($page['admin_email']));
! $GLOBALS['phpgw']->template->set_var('page_id',$page_id
? $page_id : $page['page_id']);
$GLOBALS['phpgw']->template->set_var('page_pages',$page['page_pages']);
$headers = $this->boelements->list_headers(True);
***************
*** 369,373 ****
$GLOBALS['phpgw']->template->set_var('elementhandle','');
! if(isset($element['page_id']) ||
$GLOBALS['HTTP_GET_VARS']['page_id'])
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
--- 369,373 ----
$GLOBALS['phpgw']->template->set_var('elementhandle','');
! if(isset($page['page_id']) || $page_id)
{
$GLOBALS['phpgw']->template->parse('end','edit',True);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wcm/inc class.sopage.inc.php,1.6,1.7 class.uielement.inc.php,1.4,1.5 class.uipage.inc.php,1.7,1.8,
Miles Lott <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: wcm/templates/default element_form.tpl,1.2,1.3 page_form.tpl,1.5,1.6 site_form.tpl,1.2,1.3
- Next by Date:
[Phpgroupware-cvs] CVS: wcm/website main.php,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: wcm/templates/default element_form.tpl,1.2,1.3 page_form.tpl,1.5,1.6 site_form.tpl,1.2,1.3
- Next by thread:
[Phpgroupware-cvs] CVS: wcm/website main.php,1.5,1.6
- Index(es):