[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.25,1.26

[Bettina Gille <address@hidden>]

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

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

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** class.uicategories.inc.php  20 Apr 2003 20:43:26 -0000      1.25
--- class.uicategories.inc.php  24 Jun 2003 22:33:16 -0000      1.26
***************
*** 32,36 ****
                function uicategories()
                {
!                       $cats_app                       = 
get_var('cats_app',array('POST','GET'));      
  
                        $this->bo                       = 
CreateObject('preferences.bocategories',$cats_app);
--- 32,36 ----
                function uicategories()
                {
!                       $cats_app                       = 
get_var('cats_app',array('GET','POST'));      
  
                        $this->bo                       = 
CreateObject('preferences.bocategories',$cats_app);
***************
*** 71,74 ****
--- 71,75 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_search',lang('Search'));
                        
$GLOBALS['phpgw']->template->set_var('lang_done',lang('Done'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_cancel',lang('cancel'));
                        
$GLOBALS['phpgw']->template->set_var('lang_sub',lang('Add sub'));
                        
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
***************
*** 93,100 ****
                function index()
                {
!                       $cats_app               = 
get_var('cats_app',array('POST','GET'));
!                       $extra                  = 
get_var('extra',array('POST','GET'));
!                       $global_cats    = 
get_var('global_cats',array('POST','GET'));
!                       $cats_level             = 
get_var('cats_level',array('POST','GET'));
  
                        $link_data = array
--- 94,101 ----
                function index()
                {
!                       $cats_app               = 
get_var('cats_app',array('GET','POST'));
!                       $extra                  = 
get_var('extra',array('GET','POST'));
!                       $global_cats    = 
get_var('global_cats',array('GET','POST'));
!                       $cats_level             = 
get_var('cats_level',array('GET','POST'));
  
                        $link_data = array
***************
*** 131,135 ****
                        }
  
-                       $this->bo->cats->app_name = $cats_app;
                        $cats = $this->bo->get_list($global_cats);
  
--- 132,135 ----
***************
*** 291,295 ****
                        $cat_data       = get_var('cat_data',array('POST'));
  
!                       if (get_var('submit',Array('POST')))
                        {
                                if (is_array($cat_data))
--- 291,295 ----
                        $cat_data       = get_var('cat_data',array('POST'));
  
!                       if ($_POST['save'])
                        {
                                if (is_array($cat_data))
***************
*** 316,320 ****
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Add %1 category for',
!                               
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
                        $GLOBALS['phpgw']->common->phpgw_header();
  
--- 316,320 ----
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Add %1 category for',
!                                                                               
                                        
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
                        $GLOBALS['phpgw']->common->phpgw_header();
  
***************
*** 376,380 ****
  
                        $link_data['menuaction'] = 
'preferences.uicategories.index';
!                       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        $GLOBALS['phpgw']->template->parse('buttons','add');
--- 376,380 ----
  
                        $link_data['menuaction'] = 
'preferences.uicategories.index';
!                       
$GLOBALS['phpgw']->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        $GLOBALS['phpgw']->template->parse('buttons','add');
***************
*** 410,414 ****
                        $GLOBALS['phpgw']->common->phpgw_header();
  
!                       if (get_var('submit',Array('POST')))
                        {
                                if (is_array($cat_data))
--- 410,414 ----
                        $GLOBALS['phpgw']->common->phpgw_header();
  
!                       if ($_POST['save'])
                        {
                                if (is_array($cat_data))
***************
*** 448,452 ****
                        
$GLOBALS['phpgw']->template->set_var('message',$message);
                        
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
!                       
$GLOBALS['phpgw']->template->set_var('doneurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        $link_data['menuaction'] = 
'preferences.uicategories.edit';
--- 448,452 ----
                        
$GLOBALS['phpgw']->template->set_var('message',$message);
                        
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
!                       
$GLOBALS['phpgw']->template->set_var('cancel_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        $link_data['menuaction'] = 
'preferences.uicategories.edit';
***************
*** 475,479 ****
                                                                                
                                                                                
                                                'type'  => $type,
                                                                                
                                                                                
                                        'selected'      => $cats['parent'],
!                                                                               
                                                                                
                                        'globals'       => $global_cats)));
  
                        
$GLOBALS['phpgw']->template->set_var('access',$cats['access'] == 'private'?' 
checked':'');
--- 475,480 ----
                                                                                
                                                                                
                                                'type'  => $type,
                                                                                
                                                                                
                                        'selected'      => $cats['parent'],
!                                                                               
                                                                                
                                        'globals'       => $global_cats,
!                                                                               
                                                                                
                                                'self'  => $this->cat_id)));
  
                        
$GLOBALS['phpgw']->template->set_var('access',$cats['access'] == 'private'?' 
checked':'');
***************
*** 496,500 ****
                        }
  
!                       if ($cats[0]['owner'] == $this->account)
                        {
                                $link_data['menuaction'] = 
'preferences.uicategories.delete';
--- 497,501 ----
                        }
  
!                       if ($cats['owner'] == $this->account)
                        {
                                $link_data['menuaction'] = 
'preferences.uicategories.delete';
***************
*** 532,542 ****
                        }
  
!                       $this->bo->cats->app_name = $cats_app;
! 
!                       if (get_var('confirm',array('POST')))
                        {
!                               if (get_var('subs',array('POST')))
                                {
!                                       switch (get_var('subs',array('POST')))
                                        {
                                                case 'move':
--- 533,541 ----
                        }
  
!                       if ($_POST['confirm'])
                        {
!                               if ($_POST['subs'])
                                {
!                                       switch ($_POST['subs'])
                                        {
                                                case 'move':