[Phpgroupware-cvs] phpgwapi/inc class.categories.inc.php, 1.118, 1.119

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.categories.inc.php 
Log Message:
bugfix delete cat

Index: class.categories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.categories.inc.php,v
retrieving revision 1.118
retrieving revision 1.119
diff -C2 -d -r1.118 -r1.119
*** class.categories.inc.php    13 Nov 2003 17:08:36 -0000      1.118
--- class.categories.inc.php    18 Nov 2003 13:23:11 -0000      1.119
***************
*** 663,667 ****
                                                {
                                                        
$this->db->query('UPDATE phpgw_categories set cat_level=0, cat_parent=0, 
cat_main=' . intval($cats[$i]['cat_id'])
!                                                                               
. ' WHERE cat_id=' . intval($cats[$i]['cat_id']) . "' AND cat_appname='" . 
$this->app_name . "'",__LINE__,__FILE__);
                                                        $new_main = 
$cats[$i]['cat_id'];
                                                }
--- 663,667 ----
                                                {
                                                        
$this->db->query('UPDATE phpgw_categories set cat_level=0, cat_parent=0, 
cat_main=' . intval($cats[$i]['cat_id'])
!                                                                               
. ' WHERE cat_id=' . intval($cats[$i]['cat_id']) . " AND cat_appname='" . 
$this->app_name . "'",__LINE__,__FILE__);
                                                        $new_main = 
$cats[$i]['cat_id'];
                                                }
***************
*** 679,688 ****
  
                                                        
$this->db->query('UPDATE phpgw_categories set cat_level=' . 
($cats[$i]['level']-1) . $update_main . $update_parent 
!                                                                               
        . ' WHERE cat_id=' . intval($cats[$i]['cat_id']) . "' AND 
cat_appname='" . $this->app_name . "'",__LINE__,__FILE__);
                                                }
                                        }
                                }
  
!                               $this->db->query('DELETE FROM phpgw_categories 
WHERE cat_id=' . $cat_id . $subdelete . "' AND cat_appname='"
                                                                . 
$this->app_name . "'",__LINE__,__FILE__);
                        }
--- 679,688 ----
  
                                                        
$this->db->query('UPDATE phpgw_categories set cat_level=' . 
($cats[$i]['level']-1) . $update_main . $update_parent 
!                                                                               
        . ' WHERE cat_id=' . intval($cats[$i]['cat_id']) . " AND cat_appname='" 
. $this->app_name . "'",__LINE__,__FILE__);
                                                }
                                        }
                                }
  
!                               $this->db->query('DELETE FROM phpgw_categories 
WHERE cat_id=' . $cat_id . $subdelete . " AND cat_appname='"
                                                                . 
$this->app_name . "'",__LINE__,__FILE__);
                        }