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

[Bettina Gille <address@hidden>]

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

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

Index: class.bocategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.bocategories.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.bocategories.inc.php  12 Oct 2002 21:17:43 -0000      1.16
--- class.bocategories.inc.php  13 Oct 2002 22:03:55 -0000      1.17
***************
*** 139,150 ****
                function formatted_list($data)
                {
!                       if ($data['globals'])
!                       {
!                               return 
$this->cats->formated_list($data['select'],$data['all'],$data['parent'],True);
!                       }
!                       else
!                       {
!                               return 
$this->cats->formated_list($data['select'],$data['all'],$data['parent']);
!                       }
                }
  
--- 139,143 ----
                function formatted_list($data)
                {
!                       return $this->cats->formatted_list($data);
                }
  

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.uicategories.inc.php  12 Oct 2002 22:32:10 -0000      1.30
--- class.uicategories.inc.php  13 Oct 2002 22:03:55 -0000      1.31
***************
*** 290,294 ****
                        }
  
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formated_list(array('format'
      => 'select',
                                                                                
                                                                                
                                        'type'          => 'all',
                                                                                
                                                                                
                                        'selected'      => $parent,
--- 290,294 ----
                        }
  
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format'
     => 'select',
                                                                                
                                                                                
                                        'type'          => 'all',
                                                                                
                                                                                
                                        'selected'      => $parent,
***************
*** 373,380 ****
                        
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats['name']));
                        
$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats['descr']));
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->formatted_list(array('select'
   => 'select',
!                                                                               
                                                                                
                                        'all'   => 'all',
!                                                                               
                                                                                
                                'parent'        => $cats['parent'],
!                                                                               
                                                                                
                        'global_cats'   => $global_cats)));
                        $GLOBALS['phpgw']->template->parse('buttons','edit');
                        $GLOBALS['phpgw']->template->fp('phpgw_body','form');
--- 373,380 ----
                        
$GLOBALS['phpgw']->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats['name']));
                        
$GLOBALS['phpgw']->template->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats['descr']));
!                       
$GLOBALS['phpgw']->template->set_var('category_list',$this->bo->cats->formatted_list(array('format'
     => 'select',
!                                                                               
                                                                                
                                                'type'  => 'all',
!                                                                               
                                                                                
                                        'selected'      => $cats['parent'],
!                                                                               
                                                                                
                                        'globals'       => $global_cats)));
                        $GLOBALS['phpgw']->template->parse('buttons','edit');
                        $GLOBALS['phpgw']->template->fp('phpgw_body','form');