[Phpgroupware-cvs] CVS: phpgwapi/inc class.categories.inc.php,1.74.2.13,1.74.2.14

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        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.74.2.13
retrieving revision 1.74.2.14
diff -C2 -r1.74.2.13 -r1.74.2.14
*** class.categories.inc.php    4 Oct 2002 19:31:52 -0000       1.74.2.13
--- class.categories.inc.php    12 Oct 2002 00:49:19 -0000      1.74.2.14
***************
*** 495,504 ****
                        $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');
  
                        if (!$cat_values['parent'] || $cat_values['parent'] == 
0)
--- 495,517 ----
                        $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'];
!                       }
!                       else
!                       {
!                               $max = 
$this->db->get_last_insert_id('phpgw_categories','cat_id');
!                       }
  
                        if (!$cat_values['parent'] || $cat_values['parent'] == 
0)
***************
*** 579,583 ****
                function edit($cat_values)
                {
!                       if (intval($cat_values['old_parent']) != 
$cat_values['parent'])
                        {
                                $this->delete($cat_values['id'],False,True);
--- 592,596 ----
                function edit($cat_values)
                {
!                       if (isset($cat_values['old_parent']) && 
intval($cat_values['old_parent']) != $cat_values['parent'])
                        {
                                $this->delete($cat_values['id'],False,True);