[Phpgroupware-cvs] CVS: admin/inc class.bocategories.inc.php,1.9,1.10 class.uicategories.inc.php,1.18,1.19

[Bettina Gille <address@hidden>]

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

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

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** class.bocategories.inc.php  4 Sep 2002 00:28:27 -0000       1.9
--- class.bocategories.inc.php  4 Sep 2002 01:58:34 -0000       1.10
***************
*** 41,52 ****
  
                        /* _debug_array($GLOBALS['HTTP_POST_VARS']); */
-                       /* Might change this to '' at the end---> */
-                       $start  = $GLOBALS['HTTP_POST_VARS']['start']  ? 
$GLOBALS['HTTP_POST_VARS']['start']  : $GLOBALS['HTTP_GET_VARS']['start'];
-                       $query  = $GLOBALS['HTTP_POST_VARS']['query']  ? 
$GLOBALS['HTTP_POST_VARS']['query']  : $GLOBALS['HTTP_GET_VARS']['query'];
-                       $sort   = $GLOBALS['HTTP_POST_VARS']['sort']   ? 
$GLOBALS['HTTP_POST_VARS']['sort']   : $GLOBALS['HTTP_GET_VARS']['sort'];
-                       $order  = $GLOBALS['HTTP_POST_VARS']['order']  ? 
$GLOBALS['HTTP_POST_VARS']['order']  : $GLOBALS['HTTP_GET_VARS']['order'];
-                       $cat_id = $GLOBALS['HTTP_POST_VARS']['cat_id'] ? 
$GLOBALS['HTTP_POST_VARS']['cat_id'] : $GLOBALS['HTTP_GET_VARS']['cat_id'];
  
!                       if(!empty($start) || $start == '0' || $start == 0)
                        {
                                if($this->debug) { echo '<br>overriding start: 
"' . $this->start . '" now "' . $start . '"'; }
--- 41,52 ----
  
                        /* _debug_array($GLOBALS['HTTP_POST_VARS']); */
  
!                       $start  = intval(get_var('start',array('POST','GET')));
!                       $query  = get_var('query',array('POST','GET'));
!                       $sort   = get_var('sort',array('POST','GET'));
!                       $order  = get_var('order',array('POST','GET'));
!                       $cat_id = intval(get_var('cat_id', 
array('POST','GET')));
! 
!                       if(!empty($start) || $start == 0)
                        {
                                if($this->debug) { echo '<br>overriding start: 
"' . $this->start . '" now "' . $start . '"'; }
***************
*** 63,74 ****
                                $this->cat_id = $cat_id;
                        }
!                       if($cat_id == '0' || $cat_id == 0 || $cat_id == '')
                        {
                                unset($this->cat_id);
                        }
                        if(isset($sort) && !empty($sort))
                        {
                                $this->sort = $sort;
                        }
                        if(isset($order) && !empty($order))
                        {
--- 63,77 ----
                                $this->cat_id = $cat_id;
                        }
! 
!                       if($cat_id == 0)
                        {
                                unset($this->cat_id);
                        }
+ 
                        if(isset($sort) && !empty($sort))
                        {
                                $this->sort = $sort;
                        }
+ 
                        if(isset($order) && !empty($order))
                        {
***************
*** 126,131 ****
                function exists($data)
                {
-                       //$data['type']   = $data['type'] ? $data['type'] : '';
-                       //$data['cat_id'] = $data['cat_id'] ? $data['cat_id'] : 
'';
                        return $this->cats->exists($data);
                }
--- 129,132 ----
***************
*** 143,147 ****
                }
  
!               function delete($cat_id,$drop_subs=False,$modify_subs=True)
                {
                        $this->cats->delete($cat_id,$drop_subs,$modify_subs);
--- 144,148 ----
                }
  
!               function delete($cat_id,$drop_subs,$modify_subs)
                {
                        $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.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uicategories.inc.php  4 Sep 2002 00:28:27 -0000       1.18
--- class.uicategories.inc.php  4 Sep 2002 01:58:34 -0000       1.19
***************
*** 475,479 ****
                        else
                        {
!                               
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this category ?'));
  
                                $exists = $this->bo->exists(array
--- 475,479 ----
                        else
                        {
!                               
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to 
delete this global category ?'));
  
                                $exists = $this->bo->exists(array
***************
*** 489,498 ****
                                        $sub_select .= '<input type="radio" 
name="subs" value="drop">' . lang('Do you want to delete all global 
subcategories ?');
                                        
$GLOBALS['phpgw']->template->set_var('sub_select',$sub_select);
- 
-                                       /*      
$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">'); */
                                }
  
--- 489,492 ----