[Phpgroupware-cvs] CVS: admin/inc class.uicategories.inc.php,1.6.2.8.2.1,1.6.2.8.2.2

[Bettina Gille <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uicategories.inc.php 
Log Message:
fix for cats

Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v
retrieving revision 1.6.2.8.2.1
retrieving revision 1.6.2.8.2.2
diff -C2 -r1.6.2.8.2.1 -r1.6.2.8.2.2
*** class.uicategories.inc.php  25 May 2003 15:41:25 -0000      1.6.2.8.2.1
--- class.uicategories.inc.php  15 Jun 2003 21:39:12 -0000      1.6.2.8.2.2
***************
*** 109,116 ****
--- 109,133 ----
                        $this->template->set_var('lang_reset',lang('Clear 
Form'));
                        $this->template->set_var('lang_cancel',lang('Cancel'));
+                       $this->template->set_var('lang_done',lang('Done'));
                }
  
                function index()
                {
+                       $link_data = array
+                       (
+                               'menuaction'    => 'admin.uicategories.add',
+                               'appname'               => $this->appname
+                       );
+ 
+                       if ($_POST['add'])
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
+                       }
+ 
+                       if ($_POST['done'])
+                       {
+                               
$GLOBALS['phpgw']->redirect_link('/admin/index.php');
+                       }
+ 
                        $this->template->set_file(array('cat_list_t' => 
'listcats.tpl'));
                        
$this->template->set_block('cat_list_t','cat_list','list');
***************
*** 124,144 ****
                        }
  
-                       $this->set_langs();
- 
-                       $link_data = array
-                       (
-                               'menuaction'    => 'admin.uicategories.index',
-                               'appname'               => $this->appname
-                       );
- 
-                       $this->template->set_var('lang_action',lang('Category 
list'));
- 
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= ' - 
'.lang('Global categories');
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
! 
                        $this->template->set_var('query',$this->query);
!                       
$this->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       
$this->template->set_var('doneurl',$GLOBALS['phpgw']->link('/admin/index.php'));
  
                        if(!$start)
--- 141,152 ----
                        }
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= ' - 
'.lang('Global categories');
                        $GLOBALS['phpgw']->common->phpgw_header();
                        echo parse_navbar();
!                       $this->set_langs();
                        $this->template->set_var('query',$this->query);
! 
!                       $link_data['menuaction'] = 'admin.uicategories.index';
!                       
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        if(!$start)
***************
*** 324,331 ****
                function edit()
                {
-                       if (!$this->acl_edit)
-                       {
-                               $GLOBALS['phpgw']->redirect_link('/index.php');
-                       }
                        $new_parent                     = 
intval($_POST['new_parent']);
                        $cat_parent                     = 
intval($_POST['cat_parent']);
--- 332,335 ----
***************
*** 345,357 ****
                        );
  
!                       if ($_POST['cancel'] || !$this->cat_id)
                        {
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
-                       if ($_POST['delete'])
-                       {
-                               $this->delete();
-                               return;
-                       }
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= ' - 
'.lang('Edit global category');
--- 349,356 ----
                        );
  
!                       if ($_POST['cancel'] || !$this->cat_id || 
!$this->acl_edit)
                        {
                                
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
                        }
  
                        $GLOBALS['phpgw_info']['flags']['app_header'] .= ' - 
'.lang('Edit global category');
***************
*** 362,369 ****
  
                        $this->template->set_file(array('form' => 
'category_form.tpl'));
-                       if (!$this->acl_delete)
-                       {
-                               
$this->template->set_block('form','delete','deletehandle');
-                       }
  
                        if ($_POST['save'])
--- 361,364 ----
***************
*** 399,405 ****
                        $link_data['menuaction']        = 
'admin.uicategories.edit'; 
                        $link_data['cat_id']            = $this->cat_id; 
!                       
$this->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
!                       $link_data['menuaction']        = 
'admin.uicategories.delete'; 
!                       
$this->template->set_var('deleteurl',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        
$this->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));
--- 394,398 ----
                        $link_data['menuaction']        = 
'admin.uicategories.edit'; 
                        $link_data['cat_id']            = $this->cat_id; 
!                       
$this->template->set_var('action_url',$GLOBALS['phpgw']->link('/index.php',$link_data));
  
                        
$this->template->set_var('cat_name',$GLOBALS['phpgw']->strip_html($cats[0]['name']));