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

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.categories.inc.php 
Log Message:
fix for bug 1286

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.74.2.12
retrieving revision 1.74.2.13
diff -C2 -r1.74.2.12 -r1.74.2.13
*** class.categories.inc.php    12 Sep 2002 16:31:32 -0000      1.74.2.12
--- class.categories.inc.php    4 Oct 2002 19:31:52 -0000       1.74.2.13
***************
*** 579,591 ****
                function edit($cat_values)
                {
!                       if ($cat_values['parent'] && ($cat_values['parent'] != 
0))
                        {
!                               $cat_values['main']  = 
$this->id2name($cat_values['parent'],'main');
!                               $cat_values['level'] = 
$this->id2name($cat_values['parent'],'level')+1;
                        }
                        else
                        {
!                               $cat_values['main']  = $cat_values['id'];
!                               $cat_values['level'] = 0;
                        }
  
--- 579,599 ----
                function edit($cat_values)
                {
!                       if (intval($cat_values['old_parent']) != 
$cat_values['parent'])
                        {
!                               $this->delete($cat_values['id'],False,True);
!                               return $this->add($cat_values);
                        }
                        else
                        {
!                               if ($cat_values['parent'] && 
($cat_values['parent'] != 0))
!                               {
!                                       $cat_values['main']  = 
intval($this->id2name($cat_values['parent'],'main'));
!                                       $cat_values['level'] = 
intval($this->id2name($cat_values['parent'],'level')+1);
!                               }
!                               else
!                               {
!                                       $cat_values['main']  = 
intval($cat_values['id']);
!                                       $cat_values['level'] = 0;
!                               }
                        }
  
***************
*** 595,602 ****
                        $sql = "UPDATE phpgw_categories SET cat_name='" . 
$cat_values['name'] . "', cat_description='" . $cat_values['descr']
                                . "', cat_data='" . $cat_values['data'] . "', 
cat_parent='" . $cat_values['parent'] . "', cat_access='"
!                               . $cat_values['access'] . "', cat_main='" . 
$cat_values['main'] . "', cat_level='" . $cat_values['level'] . "' "
!                               . "WHERE cat_appname='" . $this->app_name . "' 
AND cat_id='" . $cat_values['id'] . "'";
  
                        $this->db->query($sql,__LINE__,__FILE__);
                }
  
--- 603,611 ----
                        $sql = "UPDATE phpgw_categories SET cat_name='" . 
$cat_values['name'] . "', cat_description='" . $cat_values['descr']
                                . "', cat_data='" . $cat_values['data'] . "', 
cat_parent='" . $cat_values['parent'] . "', cat_access='"
!                               . $cat_values['access'] . "', cat_main=" . 
$cat_values['main'] . ", cat_level=" . $cat_values['level']
!                               . " WHERE cat_appname='" . $this->app_name . "' 
AND cat_id=" . intval($cat_values['id']);
  
                        $this->db->query($sql,__LINE__,__FILE__);
+                       return intval($cat_values['id']);
                }