[Phpgroupware-cvs] CVS: admin/inc class.bocategories.inc.php,1.7,1.8 class.uicategories.inc.php,1.16,1.17

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
update cats files to test new delete function

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.bocategories.inc.php  19 Mar 2002 02:35:38 -0000      1.7
--- class.bocategories.inc.php  3 Sep 2002 02:22:32 -0000       1.8
***************
*** 143,149 ****
                }
  
!               function delete($cat_id,$subs=False)
                {
!                       return $this->cats->delete($cat_id,$subs);
                }
  
--- 143,149 ----
                }
  
!               function delete($cat_id,$drop_subs=False,$modify_subs=True)
                {
!                       $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.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uicategories.inc.php  18 Jun 2002 01:13:43 -0000      1.16
--- class.uicategories.inc.php  3 Sep 2002 02:22:32 -0000       1.17
***************
*** 428,432 ****
                        if ($GLOBALS['HTTP_POST_VARS']['confirm'])
                        {
!                               if ($GLOBALS['HTTP_POST_VARS']['subs'])
                                {
                                        $this->bo->delete($this->cat_id,True);
--- 428,436 ----
                        if ($GLOBALS['HTTP_POST_VARS']['confirm'])
                        {
!                               if ($GLOBALS['HTTP_POST_VARS']['modify_subs'])
!                               {
!                                       
$this->bo->delete($this->cat_id,False,True);
!                               }
!                               elseif ($GLOBALS['HTTP_POST_VARS']['drop_subs'])
                                {
                                        $this->bo->delete($this->cat_id,True);
***************
*** 456,460 ****
                                
$GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
  
!                               if ($apps_cats)
                                {
                                        
$GLOBALS['phpgw']->template->set_var('messages',lang('This category is 
currently being used by applications as a parent category') . '<br>'
--- 460,464 ----
                                
$GLOBALS['phpgw']->template->set_var('hidden_vars',$hidden_vars);
  
!                               /*if ($apps_cats)
                                {
                                        
$GLOBALS['phpgw']->template->set_var('messages',lang('This category is 
currently being used by applications as a parent category') . '<br>'
***************
*** 470,474 ****
                                }
                                else
!                               {
                                        
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this category ?'));
  
--- 474,478 ----
                                }
                                else
!                               {*/
                                        
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this category ?'));
  
***************
*** 482,492 ****
                                        if ($exists)
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('lang_subs',lang('Do you also want to 
delete all global subcategories ?'));
!                                               
$GLOBALS['phpgw']->template->set_var('subs','<input type="checkbox" name="subs" 
value="True">');
!                                       }
!                                       else
!                                       {
!                                               
$GLOBALS['phpgw']->template->set_var('lang_subs','');
!                                               
$GLOBALS['phpgw']->template->set_var('subs', '');
                                        }
  
--- 486,494 ----
                                        if ($exists)
                                        {
!                                               
$GLOBALS['phpgw']->template->set_var('lang_drop_subs',lang('Do you also want to 
delete all global subcategories ?'));
!                                               
$GLOBALS['phpgw']->template->set_var('drop_subs','<input type="checkbox" 
name="drop_subs" value="True">');
! 
!                                               
$GLOBALS['phpgw']->template->set_var('lang_modify_subs',lang('Do you want to 
move all global subcategories one level down ?'));
!                                               
$GLOBALS['phpgw']->template->set_var('subs','<input type="checkbox" 
name="modify_subs" value="True">');
                                        }
  
***************
*** 500,504 ****
  
                                        
$GLOBALS['phpgw']->template->fp('phpgw_body','category_delete');
!                               }
                        }
                }
--- 502,506 ----
  
                                        
$GLOBALS['phpgw']->template->fp('phpgw_body','category_delete');
!                               //}
                        }
                }