[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.92,1.93

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv25822

Modified Files:
        class.categories.inc.php 
Log Message:
update edit cats

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -r1.92 -r1.93
*** class.categories.inc.php    4 Oct 2002 20:59:00 -0000       1.92
--- class.categories.inc.php    12 Oct 2002 00:50:37 -0000      1.93
***************
*** 567,575 ****
                        $cat_values['name'] = 
$this->db->db_addslashes($cat_values['name']);
  
!                       $this->db->query("INSERT INTO phpgw_categories 
(cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,"
!                               . "cat_main,cat_level) VALUES ('" . 
$cat_values['parent'] . "','" . $this->account_id . "','" . 
$cat_values['access']
                                . "','" . $this->app_name . "','" . 
$cat_values['name'] . "','" . $cat_values['descr'] . "','" . $cat_values['data']
                                . "','" . $cat_values['main'] . "','" . 
$cat_values['level'] . "')",__LINE__,__FILE__);
  
                        $max = 
$this->db->get_last_insert_id('phpgw_categories','cat_id');
  
--- 567,586 ----
                        $cat_values['name'] = 
$this->db->db_addslashes($cat_values['name']);
  
!                       if (isset($cat_values['id']))
!                       {
!                               $id_col = 'cat_id,';
!                               $id_val = $cat_values['id'].',';
!                       }
! 
!                       $this->db->query("INSERT INTO phpgw_categories 
(${id_col}cat_parent,cat_owner,cat_access,cat_appname,cat_name,cat_description,cat_data,"
!                               . "cat_main,cat_level) VALUES ($id_val'" . 
$cat_values['parent'] . "','" . $this->account_id . "','" . 
$cat_values['access']
                                . "','" . $this->app_name . "','" . 
$cat_values['name'] . "','" . $cat_values['descr'] . "','" . $cat_values['data']
                                . "','" . $cat_values['main'] . "','" . 
$cat_values['level'] . "')",__LINE__,__FILE__);
  
+                       if (isset($cat_values['id']))
+                       {
+                               $max = $cat_values['id'];
+                       }
+ 
                        $max = 
$this->db->get_last_insert_id('phpgw_categories','cat_id');
  
***************
*** 650,654 ****
                function edit($cat_values)
                {
!                       if (intval($cat_values['old_parent']) != 
$cat_values['parent'])
                        {
                                $this->delete(array('cat_id' => 
$cat_values['id'],'drop_subs' => False,'modify_subs' => True));
--- 661,665 ----
                function edit($cat_values)
                {
!                       if (isset($cat_values['old_parent']) && 
intval($cat_values['old_parent']) != $cat_values['parent'])
                        {
                                $this->delete(array('cat_id' => 
$cat_values['id'],'drop_subs' => False,'modify_subs' => True));