[Phpgroupware-cvs] hrm/inc class.uicategory.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Changes by:     Sigurd Nes <sigurdne>   06/09/16 22:26:32

Modified files:
        inc            : class.uicategory.inc.php 

Log message:
        link

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uicategory.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: class.uicategory.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uicategory.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.uicategory.inc.php    30 Nov 2005 17:07:22 -0000      1.3
+++ class.uicategory.inc.php    16 Sep 2006 22:26:32 -0000      1.4
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage admin
-       * @version $Id: class.uicategory.inc.php,v 1.3 2005/11/30 17:07:22 
sigurdne Exp $
+       * @version $Id: class.uicategory.inc.php,v 1.4 2006/09/16 22:26:32 
sigurdne Exp $
        */
 
        /**
@@ -82,8 +82,8 @@
                                (
                                        'id'                                    
=> $category['id'],
                                        'first'                                 
        => $first,
-                                       'link_edit'                             
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&id='
 . $category['id'].'&type='.$type . '&type_id=' . $type_id),
-                                       'link_delete'                           
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
 . $category['id'].'&type='.$type . '&type_id=' . $type_id),
+                                       'link_edit'                     => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.edit', 'id'=> $category['id'], 'type'=> $type,  
'type_id'=> $type_id)),
+                                       'link_delete'                   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.delete', 'id'=> $category['id'], 'type'=> $type, 
 'type_id'=> $type_id)),
                                        'lang_view_categorytext'        => 
lang('view the category'),
                                        'lang_edit_categorytext'        => 
lang('edit the category'),
                                        'lang_delete_categorytext'      => 
lang('delete the category'),
@@ -117,7 +117,7 @@
                        (
                                'lang_add'                              => 
lang('add'),
                                'lang_add_categorytext' => lang('add a 
category'),
-                               'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.edit&type='.$type
 . '&type_id=' . $type_id),
+                               'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.edit', 'type'=> $type, 'type_id'=> $type_id)),
                                'lang_done'                             => 
lang('done'),
                                'lang_done_categorytext'        => lang('back 
to admin'),
                                'done_action'                   => 
$GLOBALS['phpgw']->link('/admin/index.php')
@@ -141,7 +141,7 @@
                                'record_limit'                                  
=> $record_limit,
                                'num_records'                                   
=> count($category_list),
                                'all_records'                                   
=> $this->bo->total_records,
-                               'link_url'                                      
        => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type
 . '&type_id=' . $type_id),
+                               'link_url'                                      
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.index', 'type'=> $type,  'type_id'=> $type_id)),
                                'img_path'                                      
        => $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
                                'lang_searchfield_categorytext' => lang('Enter 
the search string. To show all entries, empty this field and press the SUBMIT 
button again'),
                                'lang_searchbutton_categorytext'        => 
lang('Submit the search string'),
@@ -153,7 +153,6 @@
                        );
 
                        $appname                                                
= lang($type). ' ' . $type_id;
-;
                        $function_msg                                   = 
lang('list %1 category',$type);
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
@@ -224,7 +223,7 @@
                        (
                                'msgbox_data'                                   
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'form_action'                                   
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'done_action'                                   
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.index&type='.$type
 . '&type_id=' . $type_id),
+                               'done_action'                           => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.index', 'type'=> $type, 'type_id'=> $type_id)),
                                'lang_id'                               => 
lang('category ID'),
                                'lang_descr'                                    
=> lang('Descr'),
                                'lang_save'                                     
        => lang('save'),
@@ -270,7 +269,7 @@
                        $data = array
                        (
                                'done_action'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_data),
-                               'delete_action'                 => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicategory.delete&id='
 . $id.'&type='.$type . '&type_id=' . $type_id),
+                               'delete_action'                 => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
$this->currentapp.'.uicategory.delete', 'id'=> $id, 'type'=> $type, 'type_id'=> 
$type_id)),
                                'lang_confirm_msg'              => lang('do you 
really want to delete this entry'),
                                'lang_yes'                              => 
lang('yes'),
                                'lang_yes_categorytext' => lang('Delete the 
entry'),
@@ -285,5 +284,4 @@
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
                //      $GLOBALS['phpgw']->xslttpl->pp();
                }
-
        }