[Phpgroupware-cvs] CVS: preferences/inc class.bocategories.inc.php,1.4,1.5 class.uicategories.inc.php,1.4,1.5

[Bettina gille <address@hidden>]

Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv21318/inc

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

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.bocategories.inc.php  13 Jan 2002 23:31:03 -0000      1.4
--- class.bocategories.inc.php  13 Jan 2002 23:50:20 -0000      1.5
***************
*** 102,108 ****
                }
  
!               function formatted_list($data)
                {
!                       return 
$this->cats->formated_list($data['select'],$data['all'],$data['cat_parent']);
                }
  
--- 102,108 ----
                }
  
!               function formatted_list($format,$type,$cat_parent,$public_cats)
                {
!                       return 
$this->cats->formated_list($format,$type,$cat_parent,$public_cats);
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uicategories.inc.php  13 Jan 2002 23:31:03 -0000      1.4
--- class.uicategories.inc.php  13 Jan 2002 23:50:20 -0000      1.5
***************
*** 298,301 ****
--- 298,306 ----
                        }
  
+                       if (!$global_cats)
+                       {
+                               $global_cats = False;
+                       }
+ 
                        if ($submit)
                        {
***************
*** 329,354 ****
                        if ($cats_level)
                        {
!                               if ($global_cats)
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','all',$cat_parent,True);
!                               }
!                               else
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','all',$cat_parent);
!                               }
                        }
                        else
                        {
!                               if ($global_cats)
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','mains',$cat_parent,True);
!                               }
!                               else
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','mains',$cat_parent);
!                               }
                        }
  
!                       $this->t->set_var('category_list',$cats_list);
                        $this->t->set_var('cat_name',$cat_name);
                        $this->t->set_var('cat_description',$cat_description);
--- 334,345 ----
                        if ($cats_level)
                        {
!                               $type = 'all';
                        }
                        else
                        {
!                               $type = 'mains';
                        }
  
!                       
$this->t->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cat_parent,$global_cats));
                        $this->t->set_var('cat_name',$cat_name);
                        $this->t->set_var('cat_description',$cat_description);
***************
*** 420,423 ****
--- 411,419 ----
                        }
  
+                       if (!$global_cats)
+                       {
+                               $global_cats = False;
+                       }
+ 
                        if ($submit)
                        {
***************
*** 456,483 ****
                        
$this->t->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
  
!                       if ($cats_level) 
                        {
!                               if ($global_cats)
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','all',$cats[0]['parent'],True);
!                               }
!                               else
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','all',$cats[0]['parent']);
!                               }
                        }
                        else
                        {
!                               if ($global_cats)
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','mains',$cats[0]['parent'],True);
!                               }
!                               else
!                               {
!                                       $cats_list = 
$this->bo->cats->formated_list('select','mains',$cats[0]['parent']);
!                               }
                        }
  
!                       $this->t->set_var('category_list',$cats_list);
  
                        $this->t->set_var('access','<input type="checkbox" 
name="cat_access" value="True"'
--- 452,465 ----
                        
$this->t->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
  
!                       if ($cats_level)
                        {
!                               $type = 'all';
                        }
                        else
                        {
!                               $type = 'mains';
                        }
  
!                       
$this->t->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cats[0]['parent'],$global_cats));
  
                        $this->t->set_var('access','<input type="checkbox" 
name="cat_access" value="True"'