[Phpgroupware-cvs] CVS: admin/inc class.bocategories.inc.php,1.6,1.7 class.uicategories.inc.php,1.12,1.13

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
update global apps cats to turn on or off showing of global systemwide cats

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.bocategories.inc.php  13 Mar 2002 16:30:32 -0000      1.6
--- class.bocategories.inc.php  19 Mar 2002 02:35:38 -0000      1.7
***************
*** 98,105 ****
                }
  
!               function get_list()
                {
                        if($this->debug) { echo '<br>querying: "' . 
$this->query . '"'; }
!                       return 
$this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,True);
                }
  
--- 98,113 ----
                }
  
!               function get_list($global_cats=False)
                {
                        if($this->debug) { echo '<br>querying: "' . 
$this->query . '"'; }
! 
!                       if ($global_cats)
!                       {
!                               return 
$this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order,True);
!                       }
!                       else
!                       {
!                               return 
$this->cats->return_sorted_array($this->start,True,$this->query,$this->sort,$this->order);
!                       }
                }
  
***************
*** 125,129 ****
                function formatted_list($data)
                {
!                       return 
$this->cats->formated_list($data['select'],$data['all'],$data['cat_parent'],True);
                }
  
--- 133,144 ----
                function formatted_list($data)
                {
!                       if ($data['global_cats'])
!                       {
!                               return 
$this->cats->formated_list($data['select'],$data['all'],$data['cat_parent'],True);
!                       }
!                       else
!                       {
!                               return 
$this->cats->formated_list($data['select'],$data['all'],$data['cat_parent']);
!                       }
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uicategories.inc.php  16 Mar 2002 01:57:56 -0000      1.12
--- class.uicategories.inc.php  19 Mar 2002 02:35:38 -0000      1.13
***************
*** 96,99 ****
--- 96,101 ----
                function index()
                {
+                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
+ 
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
***************
*** 107,111 ****
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname']
                        );
  
--- 109,114 ----
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname'],
!                               'global_cats'   => $global_cats
                        );
  
***************
*** 129,133 ****
                        }
  
!                       $categories = $this->bo->get_list();
  
                        $left  = 
$this->nextmatchs->left('/index.php',$this->start,$this->bo->cats->total_records,$link_data);
--- 132,141 ----
                        }
  
!                       if (!$global_cats)
!                       {
!                               $global_cats = False;
!                       }
! 
!                       $categories = $this->bo->get_list($global_cats);
  
                        $left  = 
$this->nextmatchs->left('/index.php',$this->start,$this->bo->cats->total_records,$link_data);
***************
*** 230,237 ****
                function add()
                {
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname']
                        );
  
--- 238,248 ----
                function add()
                {
+                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
+ 
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname'],
!                               'global_cats'   => $global_cats
                        );
  
***************
*** 292,296 ****
                        
$this->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
!                       
$this->template->set_var('category_list',$this->bo->formatted_list(array('select'
 => 'select','all' => 'all','cat_parent' => $cat_parent)));
                        $this->template->set_var('cat_name',$cat_name);
                        
$this->template->set_var('cat_description',$cat_description);
--- 303,309 ----
                        
$this->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
!                       
$this->template->set_var('category_list',$this->bo->formatted_list(array('select'
 => 'select','all' => 'all','cat_parent' => $cat_parent,
!                                                                               
                                                                                
                'global_cats' => $global_cats)));
!                       
                        $this->template->set_var('cat_name',$cat_name);
                        
$this->template->set_var('cat_description',$cat_description);
***************
*** 304,311 ****
                function edit()
                {
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname']
                        );
  
--- 317,327 ----
                function edit()
                {
+                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
+ 
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname'],
!                               'global_cats'   => $global_cats
                        );
  
***************
*** 381,385 ****
                        
$this->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
                        
$this->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
!                       
$this->template->set_var('category_list',$this->bo->formatted_list(array('select'
 => 'select','all' => 'all', 'cat_parent' => $cats[0]['parent'])));
  
                        $this->template->set_var('edithandle','');
--- 397,402 ----
                        
$this->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
                        
$this->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
!                       
$this->template->set_var('category_list',$this->bo->formatted_list(array('select'
 => 'select','all' => 'all','cat_parent' => $cats[0]['parent'],
!                                                                               
                                                                                
        'global_cats' => $global_cats)));
  
                        $this->template->set_var('edithandle','');
***************
*** 391,398 ****
                function delete()
                {
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname']
                        );
  
--- 408,418 ----
                function delete()
                {
+                       $global_cats = 
$GLOBALS['HTTP_POST_VARS']['global_cats'] ? 
$GLOBALS['HTTP_POST_VARS']['global_cats'] : 
$GLOBALS['HTTP_GET_VARS']['global_cats'];
+       
                        $link_data = array
                        (
                                'menuaction'    => 'admin.uicategories.index',
!                               'appname'               => $GLOBALS['appname'],
!                               'global_cats'   => $global_cats
                        );