[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] hrm index.php inc/class.menu.inc.php inc/class....
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] hrm index.php inc/class.menu.inc.php inc/class.... |
|
Date: |
Sat, 16 Sep 2006 17:52:56 +0000 |
CVSROOT: /sources/phpgroupware
Module name: hrm
Changes by: Sigurd Nes <sigurdne> 06/09/16 17:52:56
Modified files:
. : index.php
inc : class.menu.inc.php class.uijob.inc.php
class.uiplace.inc.php class.uiuser.inc.php
hook_admin.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/index.php?cvsroot=phpgroupware&r1=1.1.1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uijob.inc.php?cvsroot=phpgroupware&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uiplace.inc.php?cvsroot=phpgroupware&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.uiuser.inc.php?cvsroot=phpgroupware&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/hook_admin.inc.php?cvsroot=phpgroupware&r1=1.9&r2=1.10
Patches:
Index: index.php
===================================================================
RCS file: /sources/phpgroupware/hrm/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -b -r1.1.1.1 -r1.2
--- index.php 21 Nov 2005 12:01:19 -0000 1.1.1.1
+++ index.php 16 Sep 2006 17:52:56 -0000 1.2
@@ -7,7 +7,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
- * @version $Id: index.php,v 1.1.1.1 2005/11/21 12:01:19 sigurdne Exp $
+ * @version $Id: index.php,v 1.2 2006/09/16 17:52:56 sigurdne Exp $
*/
/**
@@ -32,11 +32,11 @@
if ($start_page)
{
-
$start_page='menuaction='.$currentapp.'.ui'.$start_page.'.index';
+ $start_page =array('menuaction'=>
$currentapp.'.ui'.$start_page.'.index');
}
else
{
- $start_page='menuaction='.$currentapp.'.uiuser.index';
+ $start_page = array('menuaction'=> $currentapp.'.uiuser.index');
}
$GLOBALS['phpgw']->redirect_link('/index.php',$start_page);
Index: inc/class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.menu.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- inc/class.menu.inc.php 22 Aug 2006 08:37:24 -0000 1.6
+++ inc/class.menu.inc.php 16 Sep 2006 17:52:56 -0000 1.7
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage core
- * @version $Id: class.menu.inc.php,v 1.6 2006/08/22 08:37:24 sigurdne
Exp $
+ * @version $Id: class.menu.inc.php,v 1.7 2006/09/16 17:52:56 sigurdne
Exp $
*/
/**
@@ -41,7 +41,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiuser.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.uiuser.index'));
$menu['module'][$i]['name'] = lang('User');
$menu['module'][$i]['statustext'] = lang('User');
$i++;
@@ -50,7 +50,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uijob.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.uijob.index'));
$menu['module'][$i]['name'] =
lang('Job');
$menu['module'][$i]['statustext'] =
lang('Job');
$i++;
@@ -59,7 +59,7 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiplace.index');
+ $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.uiplace.index'));
$menu['module'][$i]['name'] =
lang('PLace');
$menu['module'][$i]['statustext'] =
lang('Place');
$i++;
@@ -71,7 +71,7 @@
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.sarissa_test.index');
+ $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.sarissa_test.index'));
$menu['module'][$i]['name']
= lang('Ajax');
$menu['module'][$i]['statustext'] =
lang('Ajax');
$i++;
@@ -84,7 +84,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uijob.index');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.uijob.index'));
$menu['sub_menu'][$j]['name']
= lang('Job type');
$menu['sub_menu'][$j]['statustext']
= lang('Job type');
$j++;
@@ -93,7 +93,7 @@
{
$menu['sub_menu'][$j]['this']=True;
}
- $menu['sub_menu'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uijob.hierarchy&paid=true');
+ $menu['sub_menu'][$j]['link']
= $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$currentapp.'.uijob.hierarchy'));
$menu['sub_menu'][$j]['name']
= lang('Organisation');
$menu['sub_menu'][$j]['statustext']
= lang('Organisation');
$j++;
Index: inc/class.uijob.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uijob.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- inc/class.uijob.inc.php 1 Sep 2006 12:08:27 -0000 1.24
+++ inc/class.uijob.inc.php 16 Sep 2006 17:52:56 -0000 1.25
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage job
- * @version $Id: class.uijob.inc.php,v 1.24 2006/09/01 12:08:27 sigurdne
Exp $
+ * @version $Id: class.uijob.inc.php,v 1.25 2006/09/16 17:52:56 sigurdne
Exp $
*/
/**
@@ -115,12 +115,12 @@
'descr'
=> $entry['descr'],
'task_count' =>
$entry['task_count'],
'quali_count' =>
$entry['quali_count'],
- 'link_add_sub'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_job&parent_id='
. $entry['id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_job&id='
. $entry['id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.delete_job&job_id='
. $entry['id']),
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.view_job&id='
. $entry['id']),
- 'link_qualification'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.qualification&job_id='
. $entry['id']),
- 'link_task'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.task&job_id='
. $entry['id']),
+ 'link_add_sub'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_job','parent_id'=> $entry['id'])),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_job', 'id'=> $entry['id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_job', 'job_id'=> $entry['id'])),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.view_job', 'id'=> $entry['id'])),
+ 'link_qualification'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.qualification', 'job_id'=> $entry['id'])),
+ 'link_task'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.task', 'job_id'=> $entry['id'])),
'lang_qualification_job_text'
=> lang('qualifications for this job'),
'lang_task_job_text'
=> lang('tasks for this job'),
'lang_view_job_text'
=> lang('view the job'),
@@ -146,8 +146,8 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_add_sub' => lang('Add sub'),
@@ -165,10 +165,10 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a
category'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_job'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_job')),
'lang_reset' => lang('reset
hierarchy'),
'lang_reset_statustext' => lang('Reset the
hierarchy'),
- 'reset_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.reset_job_type_hierarchy')
+ 'reset_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.reset_job_type_hierarchy'))
);
$table_reset_job_type[] = array
@@ -187,11 +187,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uijob.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -219,7 +219,7 @@
'img_check'
=> $GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
'lang_print'
=> lang('print'),
- 'print_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.print_pdf'),
+ 'print_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.print_pdf')),
);
$appname =
lang('job');
@@ -366,8 +366,8 @@
$content[] = array
(
'sorting' =>
$entry['value_sort'],
- 'link_up' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.qualification&resort=up&id='
. $entry['quali_id'].'&job_id=' . $job_id . '&allrows=' . $this->allrows),
- 'link_down' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.qualification&resort=down&id='
. $entry['quali_id'].'&job_id=' . $job_id . '&allrows=' . $this->allrows),
+ 'link_up' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.qualification', 'resort'=> 'up', 'id'=>
$entry['quali_id'], 'job_id'=> $job_id, 'allrows'=> $this->allrows)),
+ 'link_down' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.qualification', 'resort'=> 'down', 'id'=>
$entry['quali_id'], 'job_id'=> $job_id, 'allrows'=> $this->allrows)),
'text_up' => lang('up'),
'text_down' => lang('down'),
@@ -376,9 +376,9 @@
'descr' =>
$entry['descr'],
'remark' =>
$entry['remark'],
'category' =>
$entry['category'],
- 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.edit_qualification&job_id=$job_id&quali_id="
. $entry['quali_id']),
- 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.view_qualification&job_id=$job_id&quali_id="
. $entry['quali_id']),
- 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.delete_qualification&job_id=$job_id&quali_id="
. $entry['quali_id']),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification', 'job_id'=> $job_id, 'quali_id'=>
$entry['quali_id'])),
+ 'link_view' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.view_qualification', 'job_id'=> $job_id, 'quali_id'=>
$entry['quali_id'])),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_qualification', 'job_id'=> $job_id,
'quali_id'=> $entry['quali_id'])),
'lang_view_text' => lang('view
qualification item'),
'lang_edit_text' => lang('edit
qualification item'),
'lang_delete_text' => lang('delete
qualification item'),
@@ -398,9 +398,9 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.qualification',
-
'job_id' =>$job_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'job_id' => $job_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'sort_sorting' =>
$this->nextmatchs->show_sort_order(array
@@ -409,17 +409,17 @@
'var' => 'value_sort',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.qualification',
-
'job_id' =>$job_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'job_id' => $job_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_name' => lang('name'),
- 'lang_descr'=> lang('descr'),
- 'lang_remark'=> lang('remark'),
- 'lang_category'=> lang('category'),
+ 'lang_descr' => lang('descr'),
+ 'lang_remark' => lang('remark'),
+ 'lang_category' => lang('category'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
'lang_delete' => lang('delete'),
@@ -441,10 +441,10 @@
(
'lang_add' => lang('add'),
'lang_add_qualification_text' => lang('add a
qualification item'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_qualification&job_id='.$job_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification', 'job_id'=> $job_id)),
'lang_done' => lang('done'),
'lang_done_qualification_text' => lang('back
to user list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.index')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index'))
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -459,7 +459,7 @@
'user_values' =>
$user_values,
'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.'.uijob.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index')),
'lang_id' =>
lang('qualification ID'),
'lang_descr' =>
lang('Descr'),
'lang_save' =>
lang('save'),
@@ -517,17 +517,17 @@
$content[] = array
(
'sorting' =>
$entry['value_sort'],
- 'link_up' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.task&resort=up&id='
. $entry['id'].'&job_id=' . $job_id . '&allrows=' . $this->allrows),
- 'link_down' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.task&resort=down&id='
. $entry['id'].'&job_id=' . $job_id . '&allrows=' . $this->allrows),
+ 'link_up' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.task', 'resort'=> 'up', 'id'=> $entry['id'],
'job_id'=> $job_id, 'allrows'=> $this->allrows)),
+ 'link_down' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.task', 'resort'=> 'down', 'id'=> $entry['id'],
'job_id'=> $job_id, 'allrows'=> $this->allrows)),
'text_up' => lang('up'),
'text_down' => lang('down'),
'id' => $entry['id'],
'name' =>
$entry['name'],
'descr' =>
$entry['descr'],
- 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.edit_task&job_id=$job_id&id="
. $entry['id']),
- 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.view_task&job_id=$job_id&id="
. $entry['id']),
- 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.delete_task&job_id=$job_id&id="
. $entry['id']),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_task', 'job_id'=> $job_id, 'id'=> $entry['id'])),
+ 'link_view' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.view_task', 'job_id'=> $job_id, 'id'=> $entry['id'])),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_task', 'job_id'=> $job_id, 'id'=>
$entry['id'])),
'lang_view_text' => lang('view
task item'),
'lang_edit_text' => lang('edit
task item'),
'lang_delete_text' => lang('delete
task item'),
@@ -547,9 +547,9 @@
'var' => 'phpgw_hrm_task.name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.task',
-
'job_id' =>$job_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'job_id' => $job_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'sort_sorting' =>
$this->nextmatchs->show_sort_order(array
@@ -558,14 +558,14 @@
'var' => 'value_sort',
'order' => $this->order,
'extra' => array('menuaction' => $this->currentapp.'.uijob.task',
-
'job_id' =>$job_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'job_id' => $job_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_name' => lang('name'),
- 'lang_descr'=> lang('descr'),
+ 'lang_descr' => lang('descr'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
'lang_delete' => lang('delete'),
@@ -585,10 +585,10 @@
(
'lang_add' => lang('add'),
'lang_add_task_text' => lang('add a task
item'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_task&job_id='.$job_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_task', 'job_id'=> $job_id)),
'lang_done' => lang('done'),
'lang_done_task_text' => lang('back to user
list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.index')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index'))
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -603,7 +603,7 @@
'user_values' =>
$user_values,
'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.'.uijob.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index')),
'lang_id'
=> lang('task ID'),
'lang_descr' =>
lang('Descr'),
'lang_save'
=> lang('save'),
@@ -677,13 +677,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_task_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.task&job_id='
. $job_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.task', 'job_id'=> $job_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.task&job_id='
. $job_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.task', 'job_id'=> $job_id));
}
}
@@ -779,7 +779,7 @@
(
'menuaction' =>
$this->currentapp.'.uijob.task',
'id' => $id,
- 'job_id'=> $job_id
+ 'job_id' => $job_id
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -847,7 +847,7 @@
if ($allowed_edit)
{
- $link_edit =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.edit_qualification_type&quali_type_id="
. $entry['id']);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification_type', 'quali_type_id'=>
$entry['id']));
$text_edit = lang('edit');
}
@@ -857,8 +857,8 @@
'name' =>
$entry['name'],
'descr' =>
$entry['descr'],
'link_edit' => $link_edit,
-// 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.edit_qualification_type&quali_type_id="
. $entry['id']),
-// 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uijob.edit_qualification_type&quali_type_id="
. $entry['id']),
+// 'link_view' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification_type', 'quali_type_id'=>
$entry['id']));
+// 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification_type', 'quali_type_id'=>
$entry['id']));
'lang_select' =>
lang('select'),
'text_delete' =>
lang('delete'),
'text_edit' => $text_edit,
@@ -877,12 +877,12 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uijob.lookup_qualification',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_name' => lang('name'),
- 'lang_descr'=> lang('descr'),
+ 'lang_descr' => lang('descr'),
'lang_select' => lang('select'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
@@ -906,21 +906,21 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uijob.lookup_qualification',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
$table_add[] = array
(
'lang_add' => lang('add'),
'lang_add_qualification_text' => lang('add a
qualification item'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_qualification_type&job_id='.$job_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification_type', 'job_id'=> $job_id)),
'lang_done' => lang('done'),
'lang_done_qualification_text' => lang('back
to user list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.lookup_qualification')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.lookup_qualification'))
);
@@ -960,12 +960,12 @@
'lang_add' =>
lang('add'),
'lang_add_qualification_text' => lang('add a
qualification item'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.edit_qualification_type'),
+ 'add_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.edit_qualification_type')),
'user_values' =>
$user_values,
'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.'.uijob.index'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index')),
'lang_id' =>
lang('qualification ID'),
'lang_descr' =>
lang('Descr'),
'lang_save' =>
lang('save'),
@@ -1022,13 +1022,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_quali_tp_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.lookup_qualification&query='
. $values['name']);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.lookup_qualification', 'query'=> $values['name']));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.lookup_qualification');
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.lookup_qualification'));
}
}
@@ -1136,13 +1136,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_job_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index'));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index'));
}
}
@@ -1175,7 +1175,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.'.uijob.index&type='.$type
. '&type_id=' . $type_id),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index' ,'type'=> $type, 'type_id'=> $type_id)),
'lang_id' =>
lang('category ID'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
@@ -1246,7 +1246,7 @@
$data = array
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.index&type='.$type
. '&type_id=' . $type_id),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.index', 'type'=> $type, 'type_id'=> $type_id)),
'lang_id' =>
lang('category ID'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
@@ -1336,13 +1336,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_quali_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.qualification&job_id='
. $job_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.qualification', 'job_id'=> $job_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uijob.qualification&job_id='
. $job_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.qualification' ,'job_id'=> $job_id));
}
}
@@ -1541,7 +1541,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.delete_job&job_id='
. $job_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_job', 'job_id'=> $job_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1585,7 +1585,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.delete_task&job_id='
. $job_id .'&id='. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_task', 'job_id'=> $job_id, 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_categorytext' => lang('Delete the
entry'),
@@ -1629,7 +1629,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.delete_qualification&job_id='
. $job_id .'&quali_id='. $quali_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.delete_qualification', 'job_id'=> $job_id,
'quali_id'=> $quali_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_categorytext' => lang('Delete the
entry'),
@@ -1669,7 +1669,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uijob.reset_job_type_hierarchy'),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uijob.reset_job_type_hierarchy')),
'lang_confirm_msg' => lang('do you
really want to reset the hierarchy'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Reset the
hierarchy'),
Index: inc/class.uiplace.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uiplace.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- inc/class.uiplace.inc.php 24 May 2006 13:32:13 -0000 1.5
+++ inc/class.uiplace.inc.php 16 Sep 2006 17:52:56 -0000 1.6
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage place
- * @version $Id: class.uiplace.inc.php,v 1.5 2006/05/24 13:32:13
sigurdne Exp $
+ * @version $Id: class.uiplace.inc.php,v 1.6 2006/09/16 17:52:56
sigurdne Exp $
*/
/**
@@ -80,9 +80,9 @@
$content[] = array
(
'name'
=> $entry['name'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.edit&place_id='
. $entry['id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.delete&place_id='
. $entry['id']),
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.view&place_id='
. $entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.edit', 'place_id'=> $entry['id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.delete', 'place_id'=> $entry['id'])),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.view', 'place_id'=> $entry['id'])),
'lang_view_place_text'
=> lang('view the place'),
'lang_edit_place_text'
=> lang('edit the place'),
'text_view'
=> lang('view'),
@@ -103,8 +103,8 @@
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiplace.index',
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_delete' => lang('delete'),
@@ -124,18 +124,18 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiplace.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
$table_add[] = array
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a place'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.edit'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.edit')),
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -162,8 +162,7 @@
);
$appname =
lang('place');
-;
- $function_msg =
lang('list place');
+ $function_msg= lang('list place');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
@@ -214,13 +213,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_training_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiplace.index&place_id='
. $place_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.index', 'place_id'=> $place_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiplace.index&place_id='
. $place_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.index', 'place_id'=> $place_id));
}
}
@@ -319,7 +318,7 @@
'lang_town' => lang('town'),
'lang_remark' =>
lang('remark'),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.index'),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.index')),
'lang_cancel' =>
lang('cancel'),
'value_id' => $place_id,
);
@@ -352,7 +351,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiplace.delete&place_id='
. $place_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiplace.delete', 'place_id'=> $place_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
Index: inc/class.uiuser.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.uiuser.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- inc/class.uiuser.inc.php 1 Sep 2006 12:08:27 -0000 1.25
+++ inc/class.uiuser.inc.php 16 Sep 2006 17:52:56 -0000 1.26
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage user
- * @version $Id: class.uiuser.inc.php,v 1.25 2006/09/01 12:08:27
sigurdne Exp $
+ * @version $Id: class.uiuser.inc.php,v 1.26 2006/09/16 17:52:56
sigurdne Exp $
*/
/**
@@ -81,7 +81,7 @@
{
if($entry['grants'])
{
- $link_training =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.training&user_id='
. $entry['account_id']);
+ $link_training =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.training', 'user_id'=> $entry['account_id']));
$text_training =
lang('training');
$lang_training_user_text =
lang('Training profile');
}
@@ -90,9 +90,9 @@
(
'first_name'
=> $entry['account_firstname'],
'last_name'
=> $entry['account_lastname'],
-// 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.training&user_id='
. $entry['account_id']),
+// 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.training', 'user_id'=> $entry['account_id'])),
'link_training'
=> $link_training,
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.view&user_id='
. $entry['account_id']),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.view' ,' user_id'=> $entry['account_id'])),
'lang_view_user_text'
=> lang('view the user'),
'lang_training_user_text'
=> $lang_training_user_text,
'lang_edit_user_text'
=> lang('edit the user'),
@@ -115,10 +115,10 @@
'var' => 'account_lastname',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.index',
-
'query' =>$this->query,
+
'query' => $this->query,
'district_id' => $this->district_id,
-
'entity_id' =>$this->entity_id,
-
'cat_id' =>$this->cat_id,
+
'entity_id' => $this->entity_id,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_last_name' => lang('Last name'),
@@ -128,10 +128,10 @@
'var' => 'account_firstname',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.index',
-
'query' =>$this->query,
+
'query' => $this->query,
'district_id' => $this->district_id,
-
'entity_id' =>$this->entity_id,
-
'cat_id' =>$this->cat_id,
+
'entity_id' => $this->entity_id,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_first_name' => lang('First name'),
@@ -152,11 +152,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiuser.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -223,9 +223,7 @@
if(!$account_info['person_id'])
{
$sfields = rawurlencode(serialize($fields[0]));
- $contact_link =
$GLOBALS['phpgw']->link('/index.php',
- array
- (
+ $contact_link =
$GLOBALS['phpgw']->link('/index.php',array(
'menuaction' =>
'addressbook.uiaddressbook.add_person',
'entry' => $sfields,
)
@@ -328,13 +326,13 @@
if($this->bocommon->check_perms($this->grants[$user_id], PHPGW_ACL_EDIT))
{
- $link_edit =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uiuser.edit&user_id=$user_id&training_id="
. $entry['training_id']);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.edit', 'user_id'=> $user_id, 'training_id'=>
$entry['training_id']));
$text_edit = lang('edit');
$lang_edit_text = lang('edit training
item');
}
if($this->bocommon->check_perms($this->grants[$user_id], PHPGW_ACL_DELETE))
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uiuser.delete&user_id=$user_id&training_id="
. $entry['training_id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.delete', 'user_id'=> $user_id, 'training_id'=>
$entry['training_id']));
$text_delete =
lang('delete');
$lang_delete_text = lang('delete
training item');
}
@@ -347,7 +345,7 @@
'end_date' =>
$entry['end_date'],
'category' =>
$entry['category'],
'link_edit' => $link_edit,
- 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.".uiuser.view&user_id=$user_id&training_id="
. $entry['training_id']),
+ 'link_view' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.view', 'user_id'=> $user_id, 'training_id'=>
$entry['training_id'])),
'link_delete' => $link_delete,
'lang_view_text' => lang('view
training item'),
'lang_edit_text' =>
$lang_edit_text,
@@ -373,9 +371,9 @@
'var' => 'phpgw_hrm_training_place.name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.training',
-
'user_id' =>$user_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'user_id' => $user_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'sort_start_date' =>
$this->nextmatchs->show_sort_order(array
@@ -384,9 +382,9 @@
'var' => 'start_date',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.training',
-
'user_id' =>$user_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'user_id' => $user_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_place' => lang('place'),
@@ -396,14 +394,14 @@
'var' => 'phpgw_hrm_training.title',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiuser.training',
-
'user_id' =>$user_id,
-
'query' =>$this->query,
-
'cat_id' =>$this->cat_id,
+
'user_id' => $user_id,
+
'query' => $this->query,
+
'cat_id' => $this->cat_id,
'allrows' => $this->allrows)
)),
'lang_category' => lang('category'),
'lang_title' => lang('training'),
- 'lang_start_date'=> lang('start date'),
+ 'lang_start_date' => lang('start date'),
'lang_end_date' => lang('end date'),
'lang_view' => lang('view'),
'lang_edit' => lang('edit'),
@@ -419,7 +417,7 @@
if($this->bocommon->check_perms($this->grants[$user_id], PHPGW_ACL_ADD))
{
- $add_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.edit&user_id='.$user_id);
+ $add_action =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.edit', 'user_id'=> $user_id));
$lang_add = lang('add');
}
@@ -430,7 +428,7 @@
'add_action' => $add_action,
'lang_done' => lang('done'),
'lang_done_training_text' => lang('back
to user list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.index')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.index'))
);
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -455,7 +453,7 @@
'user_values' =>
$user_values,
'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.'.uiuser.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.index')),
'lang_id' =>
lang('training ID'),
'lang_descr' =>
lang('Descr'),
'lang_save' =>
lang('save'),
@@ -553,13 +551,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','hrm_training_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiuser.training&user_id='
. $user_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.training', 'user_id'=> $user_id));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiuser.training&user_id='
. $user_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.training', 'user_id'=> $user_id));
}
}
@@ -756,7 +754,7 @@
'lang_new_place_status_text' => lang('Enter
a new place'),
'lang_no_place'
=> lang('select a place'),
- 'form_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.training&user_id='
. $user_id),
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.training', 'user_id'=> $user_id)),
'lang_id' =>
lang('training ID'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
@@ -813,7 +811,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiuser.delete&user_id='
. $user_id .'&training_id='. $training_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uiuser.delete', 'user_id'=> $user_id, 'training_id'=>
$training_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_categorytext' => lang('Delete the
entry'),
Index: inc/hook_admin.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/hook_admin.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- inc/hook_admin.inc.php 9 Sep 2006 09:04:49 -0000 1.9
+++ inc/hook_admin.inc.php 16 Sep 2006 17:52:56 -0000 1.10
@@ -8,18 +8,18 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package hrm
* @subpackage admin
- * @version $Id: hook_admin.inc.php,v 1.9 2006/09/09 09:04:49 skwashd
Exp $
+ * @version $Id: hook_admin.inc.php,v 1.10 2006/09/16 17:52:56 sigurdne
Exp $
*/
{
$file = array
(
- 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicategories.index', 'appname' => 'hrm') ),
- 'training category'=>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'training') ),
- 'skill level'=>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'skill_level') ),
- 'experience category'=>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'experience') ),
- 'qualification category'=>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'qualification') ),
- 'Configure Access Permissions'=>
$GLOBALS['phpgw']->link('/index.php',
array('menuaction=preferences.uiadmin_acl.list_acl', 'acl_app' => 'hrm') ),
+ 'Global Categories' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uicategories.index', 'appname' => 'hrm')),
+ 'training category' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'training')),
+ 'skill level' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'skill_level')),
+ 'experience category' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'experience')),
+ 'qualification category' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'hrm.uicategory.index', 'type' => 'qualification')),
+ 'Configure Access Permissions' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'preferences.uiadmin_acl.list_acl', 'acl_app' => 'hrm')),
);
$GLOBALS['phpgw']->common->display_mainscreen($appname,$file);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] hrm index.php inc/class.menu.inc.php inc/class....,
Sigurd Nes <=