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

[Bettina gille <address@hidden>]

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

Modified Files:
        class.bocategories.inc.php class.uicategories.inc.php 
Log Message:
fix

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.bocategories.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.bocategories.inc.php  13 Jan 2002 23:50:20 -0000      1.5
--- class.bocategories.inc.php  14 Jan 2002 01:21:54 -0000      1.6
***************
*** 102,108 ****
                }
  
!               function formatted_list($format,$type,$cat_parent,$public_cats)
                {
!                       return 
$this->cats->formated_list($format,$type,$cat_parent,$public_cats);
                }
  
--- 102,108 ----
                }
  
!               function formatted_list($format,$type,$cat_parent,$global_cats)
                {
!                       return 
$this->cats->formated_list($format,$type,$cat_parent,$global_cats);
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uicategories.inc.php  13 Jan 2002 23:50:20 -0000      1.5
--- class.uicategories.inc.php  14 Jan 2002 01:21:54 -0000      1.6
***************
*** 54,58 ****
                                'order' => $this->order
                        );
- 
                        $this->bo->save_sessiondata($data,$cats_app);
                }
--- 54,57 ----
***************
*** 77,81 ****
                }
  
- 
                function cat_data($edata,$data)
                {
--- 76,79 ----
***************
*** 208,212 ****
                                        $name = '<font color="FF0000"><b>' . 
$GLOBALS['phpgw']->strip_html($cats[$i]['name']) . '</b></font>' . $appendix;
                                        $descr = '<font color="FF0000"><b>' . 
$descr . '</b></font>';
-                                       $data = '<font color="FF0000"><b>' . 
$data . '</b></font>';
                                }
  
--- 206,209 ----
***************
*** 228,233 ****
                                else
                                {
!                                       $t->set_var('add_sub','');
!                                       $t->set_var('lang_sub_entry','&nbsp;');
                                }
  
--- 225,230 ----
                                else
                                {
!                                       $this->t->set_var('add_sub','');
!                                       
$this->t->set_var('lang_sub_entry','&nbsp;');
                                }
  
***************
*** 262,266 ****
                function add()
                {
!                       global $cats_app, $extra, $global_cats, $cats_level, 
$cat_data;
  
                        $link_data = array
--- 259,263 ----
                function add()
                {
!                       global $cats_app, $extra, $global_cats, $cats_level;
  
                        $link_data = array
***************
*** 369,373 ****
                function edit()
                {
!                       global $cats_app, $extra, $global_cats, $cats_level, 
$cat_id, $cat_data;
  
                        $link_data = array
--- 366,370 ----
                function edit()
                {
!                       global $cats_app, $extra, $global_cats, $cats_level, 
$cat_id;
  
                        $link_data = array
***************
*** 394,398 ****
                        $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
                        $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
!       //              $cat_data                       = 
$GLOBALS['HTTP_POST_VARS']['cat_data'];
                        $cat_access                     = 
$GLOBALS['HTTP_POST_VARS']['cat_access'];
  
--- 391,395 ----
                        $cat_name                       = 
$GLOBALS['HTTP_POST_VARS']['cat_name'];
                        $cat_description        = 
$GLOBALS['HTTP_POST_VARS']['cat_description'];
!                       $cat_data                       = 
$GLOBALS['HTTP_POST_VARS']['cat_data'];
                        $cat_access                     = 
$GLOBALS['HTTP_POST_VARS']['cat_access'];
  
***************
*** 471,475 ****
  
                                $data = unserialize($cats[0]['data']);
-                               $cat_data = array();
                                for($i=0;$i<count($edata);$i++)
                                {
--- 468,471 ----