[Phpgroupware-cvs] CVS: admin/inc class.bocategories.inc.php,1.10,1.11 class.uicategories.inc.php,1.20,1.21

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv24024

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
update delete cats

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.bocategories.inc.php  4 Sep 2002 01:58:34 -0000       1.10
--- class.bocategories.inc.php  25 Sep 2002 01:10:26 -0000      1.11
***************
*** 144,150 ****
                }
  
!               function delete($cat_id,$drop_subs,$modify_subs)
                {
!                       $this->cats->delete($cat_id,$drop_subs,$modify_subs);
                }
  
--- 144,160 ----
                }
  
!               function delete($data)
                {
!                       if (is_array($data))
!                       {
!                               $cat_id                 = $data['cat_id'];
!                               $drop_subs              = 
(isset($data['drop_subs'])?$data['drop_subs']:False);
!                               $modify_subs    = 
(isset($data['modify_subs'])?$data['modify_subs']:False);                       
      
! 
!                               if ($cat_id > 0)
!                               {
!                                       
$this->cats->delete($cat_id,$drop_subs,$modify_subs);
!                               }
!                       }
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.uicategories.inc.php  8 Sep 2002 20:39:00 -0000       1.20
--- class.uicategories.inc.php  25 Sep 2002 01:10:26 -0000      1.21
***************
*** 431,444 ****
                                {
                                        case 'move':
!                                               
$this->bo->delete($this->cat_id,False,True);
                                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                                                break;
                                        case 'drop':
!                                               
$this->bo->delete($this->cat_id,True);
                                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                                                break;
                                        default:
                                                $error_msg = lang('Please 
choose one of the methods to handle the subcategories');
-                                               
//$this->bo->delete($this->cat_id);
                                                break;
                                }
--- 431,443 ----
                                {
                                        case 'move':
!                                               
$this->bo->delete(array('cat_id' => $this->cat_id, 'modify_subs' => True));
                                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                                                break;
                                        case 'drop':
!                                               
$this->bo->delete(array('cat_id' => $this->cat_id, 'drop_subs' => True));
                                                Header('Location: ' . 
$GLOBALS['phpgw']->link('/index.php',$link_data));
                                                break;
                                        default:
                                                $error_msg = lang('Please 
choose one of the methods to handle the subcategories');
                                                break;
                                }