[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiworkorder.inc.php class.ui...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiworkorder.inc.php class.ui... |
|
Date: |
Tue, 12 Sep 2006 13:09:02 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/12 13:09:02
Modified files:
inc : class.uiworkorder.inc.php
class.uiwo_hour.inc.php class.uirequest.inc.php
class.sorequest.inc.php
class.uitemplate.inc.php
class.uitenant_claim.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiworkorder.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiwo_hour.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uirequest.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sorequest.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitemplate.inc.php?cvsroot=phpgroupware&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitenant_claim.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- class.uiworkorder.inc.php 9 Jul 2006 19:32:12 -0000 1.28
+++ class.uiworkorder.inc.php 12 Sep 2006 13:09:02 -0000 1.29
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiworkorder.inc.php,v 1.28 2006/07/09 19:32:12
sigurdne Exp $
+ * @version $Id: class.uiworkorder.inc.php,v 1.29 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -108,7 +108,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('workorder','values','table_header',
@@ -137,7 +137,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('search');
$content[$j]['row'][$k]['text'] =
$workorder_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&query='
. $workorder_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup . '&filter=' . $this->filter);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.index','query'=>
$workorder_entry['query_location'][$uicols['name'][$k]],'lookup'=> $lookup,
'filter'=> $this->filter));
}
else
{
@@ -152,7 +152,7 @@
}
}
if($lookup &&
$k==($count_uicols_name - 2))
-
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&workorder_id='
. $workorder_entry['workorder_id']);
+
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit', 'workorder_id'=>
$workorder_entry['workorder_id']));
}
if(!$lookup)
{
@@ -161,7 +161,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('view
the workorder');
$content[$j]['row'][$k]['text'] = lang('view');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder_entry['workorder_id']);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view','id'=> $workorder_entry['workorder_id']));
$k++;
}
else
@@ -173,12 +173,12 @@
{
$content[$j]['row'][$k]['statustext'] = lang('edit
the workorder');
$content[$j]['row'][$k]['text'] = lang('edit');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder_entry['workorder_id']);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit', 'id' =>
$workorder_entry['workorder_id']));
$k++;
$content[$j]['row'][$k]['statustext'] =
lang('calculate the workorder');
$content[$j]['row'][$k]['text'] =
lang('calculate');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_entry['workorder_id']);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uiwo_hour.index',
'workorder_id'=> $workorder_entry['workorder_id']));
$k++;
}
else
@@ -191,7 +191,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('delete
the workorder');
$content[$j]['row'][$k]['text'] =
lang('delete');
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $workorder_entry['workorder_id']);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.delete', 'id'=>
$workorder_entry['workorder_id']));
$k++;
}
else
@@ -350,7 +350,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' =>
lang('add a workorder'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.add')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.add'))
);
}
@@ -372,7 +372,7 @@
'paid' =>
$this->paid
);
- $link_date_search =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+ $link_date_search =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.date_search'));
$link_excel = array
(
@@ -420,7 +420,7 @@
'link_date_search' =>
$link_date_search,
'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
- 'link_history' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
+ 'link_history' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.index')),
'lang_history_statustext' =>
lang('search for history at this location'),
'links' =>
$links,
'allow_allrows' =>
false,
@@ -475,7 +475,7 @@
{
if(!$this->acl_add && !$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$boproject =
CreateObject($this->currentapp.'.boproject');
$bolocation =
CreateObject($this->currentapp.'.bolocation');
@@ -554,7 +554,7 @@
$subject = lang(Approval).": ".
$values['workorder_id'];
// $message = lang('Workorder %1
needs approval',$values['workorder_id']);
- $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $values['project_id']).'">' . lang('Workorder %1 needs
approval',$values['workorder_id']) .'</a>';
+ $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit', 'id'=> $values['project_id'])).'">' .
lang('Workorder %1 needs approval',$values['workorder_id']) .'</a>';
$mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
@@ -598,7 +598,7 @@
{
$receipt['error'][]=array('msg'=>lang('You have no edit right for this
project'));
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view', 'id'=>$id));
}
@@ -613,7 +613,7 @@
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
$from_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
- $body = '<a href
="http://' . $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $id).'">' . lang('workorder %1 has been edited',$id) .'</a>' . "\n";
+ $body = '<a href
="http://' . $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit','id'=> $id)).'">' . lang('workorder %1
has been edited',$id) .'</a>' . "\n";
foreach($receipt['notice_owner'] as $notice)
{
$body .=
$notice . "\n";
@@ -786,19 +786,19 @@
$data = array
(
'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'calculate_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index'),
+ 'calculate_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index')),
'lang_calculate' =>
lang('Calculate Workorder'),
'lang_calculate_statustext' =>
lang('Calculate workorder by adding items from vendors prizebook or adding
general hours'),
- 'send_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&from=index'),
+ 'send_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uiwo_hour.view&from=index')),
'lang_send' =>
lang('Send Workorder'),
'lang_send_statustext' =>
lang('send this workorder to vendor'),
- 'project_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
+ 'project_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit')),
'b_account_data' =>
$b_account_data,
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.w_edit'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.w_edit')),
'record_history' =>
$record_history,
'table_header_history' =>
$table_header_history,
'lang_history' =>
lang('History'),
@@ -855,7 +855,7 @@
'location_data' =>
$location_data,
'location_type' =>
'view',
'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.index')),
'lang_year' =>
lang('Year'),
'lang_category' =>
lang('category'),
'lang_save' =>
lang('save'),
@@ -945,7 +945,7 @@
{
if(!$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$link_data = array
@@ -960,8 +960,8 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
- 'search_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true&from=workorder'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit')),
+ 'search_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index', 'lookup'=> true, 'from'=> 'workorder')),
'lang_done_statustext' => lang('Back
to the workorder list'),
'lang_add_statustext' => lang('Adds a
new project - then a new workorder'),
@@ -984,7 +984,7 @@
{
if(!$this->acl_delete)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>8, 'acl_location'=>
$this->acl2_location));
}
$id = get_var('id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
@@ -1005,7 +1005,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.delete&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.delete', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete
the entry'),
@@ -1025,7 +1025,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$boproject =
CreateObject($this->currentapp.'.boproject');
@@ -1083,10 +1083,10 @@
$data = array
(
- 'project_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view'),
+ 'project_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.view')),
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view')),
'record_history' =>
$record_history,
'table_header_history' =>
$table_header_history,
'lang_history' =>
lang('History'),
@@ -1131,7 +1131,7 @@
'location_data' =>
$location_data,
'location_type' =>
'view',
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.index')),
'lang_year' =>
lang('Year'),
'lang_category' =>
lang('category'),
'lang_save' =>
lang('save'),
@@ -1176,7 +1176,7 @@
'key_deliver_list' =>
$this->bo->select_key_location_list($values['key_deliver']),
'lang_key_deliver' =>
lang('key deliver location'),
- 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $id),
+ 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
$this->currentapp.'.uiworkorder.edit', 'id' => $id)),
'lang_edit_statustext' =>
lang('Edit this entry workorder'),
'lang_edit' =>
lang('Edit'),
'currency' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.uiwo_hour.inc.php 21 Aug 2006 13:33:48 -0000 1.27
+++ class.uiwo_hour.inc.php 12 Sep 2006 13:09:02 -0000 1.28
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiwo_hour.inc.php,v 1.27 2006/08/21 13:33:48
sigurdne Exp $
+ * @version $Id: class.uiwo_hour.inc.php,v 1.28 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -121,10 +121,10 @@
'amount'
=> $entry['amount'],
'descr'
=> $entry['descr'],
'entry_date'
=> $entry_date,
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit_deviation&workorder_id='
. $workorder_id . '&hour_id=' . $hour_id . '&id=' . $entry['id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.edit_deviation', 'workorder_id'=> $workorder_id,
'hour_id'=> $hour_id, 'id'=> $entry['id'])),
'lang_edit_statustext'
=> lang('edit the deviation'),
'text_edit'
=> lang('edit'),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.delete&workorder_id='
. $workorder_id . '&hour_id=' . $hour_id . '&deviation_id=' . $entry['id']),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.delete', 'workorder_id'=> $workorder_id,
'hour_id'=> $hour_id, 'deviation_id'=> $entry['id'])),
'lang_delete_statustext'
=> lang('delete the deviation'),
'text_delete'
=> lang('delete'),
);
@@ -146,8 +146,8 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiwo_hour.edit_deviation',
- 'workorder_id' =>$workorder_id,
- 'hour_id'
=>$hour_id
+ 'workorder_id' =>
$workorder_id,
+ 'hour_id' => $hour_id
);
@@ -160,7 +160,7 @@
'lang_add_statustext' =>
lang('add a deviation'),
'add_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_done'
=> lang('done'),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index', 'workorder_id'=> $workorder_id))
);
$appname =
lang('Workorder');
@@ -246,7 +246,7 @@
'lang_hour_id'
=> lang('Post'),
'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.'.uiwo_hour.deviation&workorder_id='
. $workorder_id . '&hour_id=' . $hour_id),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.deviation', 'workorder_id'=> $workorder_id,
'hour_id'=> $hour_id)),
'lang_id'
=> lang('deviation ID'),
'lang_descr'
=> lang('Descr'),
'lang_save'
=> lang('save'),
@@ -280,7 +280,7 @@
{
$receipt['error'][]=array('msg'=>lang('You have
no edit right for this project'));
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view&id='
. $workorder_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view','id'=> $workorder_id));
}
*/
$hour_list = $this->bo->read($workorder_id);
@@ -346,8 +346,8 @@
'result'
=> ($hour['deviation']+$hour['cost']),
'wo_hour_category'
=> $hour['wo_hour_category'],
'cat_per_cent'
=> $hour['cat_per_cent'],
- 'link_deviation'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.deviation&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&workorder_id='
. $workorder_id . '&hour_id=' . $hour['hour_id']),
+ 'link_deviation'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.deviation', 'workorder_id'=> $workorder_id,
'hour_id'=> $hour['hour_id'])),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.edit','workorder_id'=> $workorder_id, 'hour_id'=>
$hour['hour_id'])),
'lang_edit_statustext'
=> lang('edit/customise this hour'),
'lang_delete_statustext'
=> lang('delete this hour'),
'text_edit'
=> lang('edit'),
@@ -406,7 +406,7 @@
);
$workorder_data = array(
- 'link_workorder'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&id='
. $workorder_id),
+ 'link_workorder' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit', 'id'=> $workorder_id)),
'lang_vendor_name'
=> lang('Vendor'),
'vendor_name'
=> $workorder['vendor_name'],
'vendor_email'
=> $workorder['vendor_email'],
@@ -415,7 +415,7 @@
'lang_workorder_id'
=> lang('Workorder ID'),
'workorder_id'
=> $workorder['workorder_id'],
'lang_project_id'
=> lang('Project ID'),
- 'link_project'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $workorder['project_id']),
+ 'link_project' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uiproject.edit',
'id'=> $workorder['project_id'])),
'project_id'
=> $workorder['project_id'],
'lang_workorder_title' =>
lang('Workorder title'),
@@ -464,7 +464,7 @@
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&workorder_id='
. $workorder_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.save_template', 'workorder_id'=> $workorder_id)),
'lang_done_statustext' =>
lang('Back to the workorder list'),
'lang_add_statustext' =>
lang('Adds this workorders calculation as a template for later use'),
@@ -499,7 +499,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour','menu'));
@@ -520,27 +520,27 @@
(
'lang_add_prizebook'
=> lang('Add from prizebook'),
'lang_add_prizebook_statustext' =>
lang('add items from this vendors prizebook'),
- 'add_prizebook_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.prizebook&workorder_id='
. $workorder_id),
+ 'add_prizebook_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.prizebook', 'workorder_id'=> $workorder_id)),
'lang_add_template'
=> lang('Add from template'),
'lang_add_template_statustext' =>
lang('add items from a predefined template'),
- 'add_template_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.index&lookup=true&workorder_id='
. $workorder_id),
+ 'add_template_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.index','lookup'=> true, 'workorder_id'=>
$workorder_id)),
'lang_add_custom'
=> lang('Add custom'),
'lang_add_custom_statustext' =>
lang('Add single custom line'),
- 'add_custom_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.edit&from=index&workorder_id='
. $workorder_id),
+ 'add_custom_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.edit', 'from'=> 'index', 'workorder_id'=>
$workorder_id)),
'lang_save_template'
=> lang('Save as template'),
'lang_save_template_statustext' =>
lang('Save this workorder as a template for later use'),
- 'save_template_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.save_template&from=index&workorder_id='
. $workorder_id),
+ 'save_template_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.save_template', 'from'=> 'index',
'workorder_id'=> $workorder_id)),
'lang_print_view'
=> lang('Print view'),
'lang_print_view_statustext' =>
lang('View the complete workorder'),
- 'print_view_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&from=index&workorder_id='
. $workorder_id),
+ 'print_view_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.view', 'from'=> 'index', 'workorder_id'=>
$workorder_id)),
'lang_view_tender'
=> lang('View tender'),
'lang_view_tender_statustext' =>
lang('View the complete workorder as a tender for bidding'),
- 'view_tender_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.tender&from=index&workorder_id='
. $workorder_id),
+ 'view_tender_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.tender', 'from'=>'index', 'workorder_id'=>
$workorder_id)),
'lang_show_cost'
=> lang('Show calculated cost'),
'lang_show_cost_statustext'
=> lang('Show calculated cost on the printview'),
@@ -558,7 +558,7 @@
$data = array
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&delete=true&workorder_id='
. $workorder_id),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index', 'delete'=>true, 'workorder_id'=>
$workorder_id)),
'function'
=> 'index',
'links'
=> $links,
'num_records'
=> count($hours_list),
@@ -586,7 +586,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour','menu'));
@@ -675,7 +675,7 @@
(
'lang_done' =>
lang('Done'),
'lang_done_statustext' =>
lang('Back to calculation'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index', 'workorder_id'=> $workorder_id))
);
$dateformat
= $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
@@ -874,7 +874,7 @@
'to_email'
=> $to_email,
'email_list'
=> $email_list,
'lang_select_email'
=> lang('Select email'),
- 'send_order_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&send=true&workorder_id='
. $workorder_id . '&show_details=' . $show_details),
+ 'send_order_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.view', 'send'=>true, 'workorder_id'=>
$workorder_id, 'show_details'=> $show_details)),
'lang_no_history'
=> lang('No history'),
'lang_history'
=> lang('History'),
@@ -909,7 +909,7 @@
$pdf =
CreateObject('phpgwapi.pdf');
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$show_cost = get_var('show_cost',array('POST','GET'));
$mark_draft = get_var('mark_draft',array('POST','GET'));
@@ -1032,7 +1032,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
@@ -1138,7 +1138,7 @@
(
'lang_done' =>
lang('Done'),
'lang_done_statustext' => lang('Back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index', 'workorder_id'=> $workorder_id))
);
$link_data = array
@@ -1236,7 +1236,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
@@ -1364,39 +1364,39 @@
(
'lang_done' =>
lang('Done'),
'lang_done_statustext' => lang('Back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index', 'workorder_id'=> $workorder_id))
);
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uiwo_hour.template',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'template_id' =>$template_id,
- 'allrows'
=>$this->allrows,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'template_id' => $template_id,
+ 'allrows' => $this->allrows,
+ 'query' => $this->query
);
$link_data_nextmatch = array
(
'menuaction' =>
$this->currentapp.'.uiwo_hour.template',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'template_id' =>$template_id,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'template_id' => $template_id,
+ 'query' => $this->query
);
$link_data_delete = array
(
'menuaction' =>
$this->currentapp.'.uiwo_hour.template',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'allrows'
=>$this->allrows,
- 'delete' =>true,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'allrows' => $this->allrows,
+ 'delete' => true,
+ 'query' => $this->query
);
@@ -1473,7 +1473,7 @@
{
if(!$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$from =
get_var('from',array('POST','GET'));
$template_id =
get_var('template_id',array('POST','GET'));
@@ -1542,7 +1542,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.'.uiwo_hour.'
. $from . '&workorder_id=' . $workorder_id . '&template_id=' . $template_id),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.' . $from, 'workorder_id'=> $workorder_id,
'template_id'=> $template_id)),
'lang_workorder'
=> lang('Workorder'),
'value_workorder_id' =>
$workorder['workorder_id'],
'value_workorder_title' =>
$workorder['title'],
@@ -1582,7 +1582,6 @@
'value_total_cost'
=> $values['cost'],
'lang_total_cost_statustext' => lang('Enter
the total cost of this activity - if not to be calculated from unit-cost'),
-
'lang_vendor'
=> lang('Vendor'),
'value_vendor_id'
=> $workorder['vendor_id'],
'value_vendor_name'
=> $workorder['vendor_name'],
@@ -1627,7 +1626,7 @@
'lang_building_part_statustext' =>
lang('Select the building part for this activity.'),
- 'ns3420_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.ns3420'),
+ 'ns3420_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.ns3420')),
'lang_ns3420'
=> lang('NS3420'),
'value_ns3420_id'
=> $values['ns3420_id'],
'lang_ns3420_statustext' =>
lang('Select a standard-code from the norwegian standard'),
@@ -1651,7 +1650,7 @@
{
if(!$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$id =
get_var('id',array('POST','GET'));
$workorder_id =
get_var('workorder_id',array('POST','GET'));
Index: class.uirequest.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.uirequest.inc.php 17 Jun 2006 08:45:56 -0000 1.23
+++ class.uirequest.inc.php 12 Sep 2006 13:09:02 -0000 1.24
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uirequest.inc.php,v 1.23 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uirequest.inc.php,v 1.24 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -98,7 +98,7 @@
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$file_name =
urldecode(get_var('file_name',array('POST','GET')));
@@ -144,7 +144,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('request','table_header',
@@ -179,7 +179,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('search');
$content[$j]['row'][$k]['text'] =
$request_entry[$uicols['name'][$k]];
-
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index&query='
. $request_entry['query_location'][$uicols['name'][$k]] . '&project_id=' .
$project_id);
+
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.index', 'query'=>
$request_entry['query_location'][$uicols['name'][$k]], 'project_id'=>
$project_id));
}
else
{
@@ -197,7 +197,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('view the
request');
$content[$j]['row'][$k]['text']
= lang('view');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.view&id='
. $request_entry['request_id']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.view', 'id'=> $request_entry['request_id']));
$k++;
}
@@ -205,7 +205,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('edit the
request');
$content[$j]['row'][$k]['text']
= lang('edit');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.edit&id='
. $request_entry['request_id']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.edit', 'id'=> $request_entry['request_id']));
$k++;
}
@@ -213,7 +213,7 @@
{
$content[$j]['row'][$k]['statustext'] = lang('delete the
request');
$content[$j]['row'][$k]['text']
= lang('delete');
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.delete&id='
. $request_entry['request_id']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.delete', 'id'=> $request_entry['request_id']));
$k++;
}
@@ -225,7 +225,7 @@
$content[$j]['row'][$k]['statustext'] = lang('view the
request');
$content[$j]['row'][$k]['text']
= lang('view');
$content[$j]['row'][$k]['target'] = '_blank';
- $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.view&id='
. $request_entry['request_id']);
+ $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.view', 'id'=> $request_entry['request_id']));
$content[$j]['row'][$k]['request_id'] =
$request_entry['request_id'];
$k++;
}
@@ -364,40 +364,40 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
request'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.edit'))
);
}
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uirequest.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'filter'
=>$this->filter,
- 'status_id'
=>$this->status_id,
- 'project_id' =>$project_id,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' =>
$this->district_id,
+ 'filter' =>
$this->filter,
+ 'status_id' =>
$this->status_id,
+ 'project_id' => $project_id,
+ 'query' => $this->query
);
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uirequest.excel',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'filter'
=>$this->filter,
- 'status_id'
=>$this->status_id,
- 'project_id' =>$project_id,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' =>
$this->cat_id,
+ 'district_id' =>
$this->district_id,
+ 'filter' =>
$this->filter,
+ 'status_id' =>
$this->status_id,
+ 'project_id' => $project_id,
+ 'query' => $this->query
);
if($this->acl_manage)
{
- $link_priority_key
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.priority_key');
+ $link_priority_key =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.priority_key'));
}
if(!$this->allrows)
@@ -423,7 +423,7 @@
'lang_update_project'
=> lang('Update project'),
'lang_add_to_project_statustext' =>
lang('add selected request to project'),
- 'add_to_project_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_id),
+ 'add_to_project_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit', 'id'=> $project_id)),
'project_id'
=> $project_id,
'lookup'
=> $lookup,
@@ -482,7 +482,7 @@
{
if(!$this->acl_manage)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=16&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>16, 'acl_location'=>
$this->acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('request'));
$GLOBALS['phpgw_info']['flags'][noheader] = True;
@@ -523,7 +523,7 @@
{
if(!$this->acl_add && !$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$id =
get_var('id',array('POST','GET'));
$values =
get_var('values',array('POST'));
@@ -860,7 +860,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp
. $values['origin'][$i]['link']);
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -902,7 +902,7 @@
'value_origin_id'
=> $origin_id,
'lang_origin_statustext' =>
lang('Link to the origin for this request'),
- 'generate_project_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
+ 'generate_project_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit')),
'lang_generate_project'
=> lang('Generate project'),
'lang_generate_project_statustext' =>
lang('Generate a project from this request'),
'location_code'
=> $values['location_code'],
@@ -916,7 +916,7 @@
'importance_weight'
=> $importance_weight,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit')),
'record_history'
=> $record_history,
'table_header_history' =>
$table_header_history,
'lang_history'
=> lang('History'),
@@ -950,7 +950,7 @@
'location_data'
=> $location_data,
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.index')),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -1018,7 +1018,7 @@
{
if(!$this->acl_delete)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>8, 'acl_location'=>
$this->acl2_location));
}
$id = get_var('id',array('POST','GET'));
@@ -1040,7 +1040,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.delete&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.delete', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1060,7 +1060,7 @@
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$id =
get_var('id',array('POST','GET'));
@@ -1171,7 +1171,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp
. $values['origin'][$i]['link']);
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -1214,7 +1214,7 @@
'table_header_importance' =>
$table_header_importance,
'importance_weight_view' =>
$importance_weight,
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
+ 'workorder_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit')),
'record_history'
=> $record_history,
'table_header_history' =>
$table_header_history,
'lang_history'
=> lang('History'),
@@ -1234,7 +1234,7 @@
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.index'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.index')),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -1263,7 +1263,7 @@
'branch_list'
=> $this->boproject->select_branch_list($values['branch_id']),
'lang_branch'
=> lang('branch'),
- 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.edit&id='
. $id),
+ 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.edit', 'id'=> $id)),
'lang_edit_statustext'
=> lang('Edit this entry request'),
'lang_edit'
=> lang('Edit'),
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
Index: class.sorequest.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.sorequest.inc.php 21 Apr 2006 19:09:20 -0000 1.17
+++ class.sorequest.inc.php 12 Sep 2006 13:09:02 -0000 1.18
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.sorequest.inc.php,v 1.17 2006/04/21 19:09:20
sigurdne Exp $
+ * @version $Id: class.sorequest.inc.php,v 1.18 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -343,7 +343,6 @@
$request['start_date']
= $this->db->f('start_date');
$request['end_date']
= $this->db->f('end_date');
$request['cat_id']
= $this->db->f('category');
-
$request['branch_id']
= $this->db->f('branch_id');
$request['authorities_demands']
= $this->db->f('authorities_demands');
$request['score']
= $this->db->f('score');
@@ -520,7 +519,7 @@
$this->soproject->update_power_meter($request['power_meter'],$request['location_code'],$address);
}
- if($request['origin'][0]['data'][0]['id'])
+ if(is_array($request['origin']) &&
isset($request['origin'][0]['data'][0]['id']))
{
$this->db->query("INSERT INTO fm_origin
(origin,origin_id,destination,destination_id,user_id,entry_date) "
. "VALUES ('"
Index: class.uitemplate.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitemplate.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- class.uitemplate.inc.php 17 Jun 2006 08:45:56 -0000 1.12
+++ class.uitemplate.inc.php 12 Sep 2006 13:09:02 -0000 1.13
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uitemplate.inc.php,v 1.12 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uitemplate.inc.php,v 1.13 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -77,7 +77,8 @@
function index()
{
- $GLOBALS['phpgw']->xslttpl->add_file(array('template',
+ $GLOBALS['phpgw']->xslttpl->add_file(array(
+ 'template',
'menu',
'nextmatchs',
'search_field'));
@@ -101,11 +102,11 @@
'entry_date' =>
$template['entry_date'],
'chapter' =>
$template['chapter'],
'lang_select' =>
lang('Select'),
- 'form_action_select' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.template'),
+ 'form_action_select' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.template')),
'lang_select_statustext' =>
lang('Select this template to view the details'),
- 'link_view' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.hour&template_id='
. $template['template_id']),
- 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.edit_template&template_id='
. $template['template_id']),
- 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.delete&id='
. $template['template_id']),
+ 'link_view' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.hour','template_id'=> $template['template_id'])),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.edit_template','template_id'=>
$template['template_id'])),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.delete', 'id'=> $template['template_id'])),
'lang_view_statustext' =>
lang('view the template'),
'lang_edit_statustext' =>
lang('edit the template'),
'lang_delete_statustext' =>
lang('delete the template'),
@@ -158,11 +159,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uitemplate.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'chapter_id'
=>$this->chapter_id,
- 'workorder_id' =>$workorder_id,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'chapter_id' => $this->chapter_id,
+ 'workorder_id' => $workorder_id,
+ 'query' => $this->query
);
if(!$this->allrows)
@@ -178,14 +179,14 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a
template'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.edit_template')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.edit_template'))
);
$table_done[] = array
(
'lang_done' =>
lang('Done'),
'lang_done_statustext' => lang('Back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.index&workorder_id='
. $workorder_id)
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.index','workorder_id'=> $workorder_id))
);
$data = array
@@ -305,8 +306,8 @@
'billperae'
=> $template['billperae'],
'building_part' =>
$template['building_part'],
'dim_d'
=> $template['dim_d'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.edit_hour&hour_id='
. $template['hour_id'] . '&template_id=' . $template_id),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.hour&delete=true&template_id='
. $template_id . '&hour_id=' . $template['hour_id']),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.edit_hour','hour_id'=> $template['hour_id'],
'template_id'=> $template_id)),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.hour','delete'=>true, 'template_id'=>
$template_id, 'hour_id'=> $template['hour_id'])),
'lang_edit_statustext' =>
lang('edit the template'),
'lang_delete_statustext' =>
lang('delete the template'),
'text_edit'
=> lang('edit'),
@@ -359,46 +360,46 @@
(
'lang_done' =>
lang('Done'),
'lang_done_statustext' => lang('Back to list'),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.index')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.index'))
);
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uitemplate.hour',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'template_id' =>$template_id,
- 'allrows'
=>$this->allrows,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'template_id' => $template_id,
+ 'allrows' => $this->allrows,
+ 'query' => $this->query
);
$link_data_nextmatch = array
(
'menuaction' =>
$this->currentapp.'.uitemplate.hour',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'template_id' =>$template_id,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'template_id' => $template_id,
+ 'query' => $this->query
);
$link_data_delete = array
(
'menuaction' =>
$this->currentapp.'.uitemplate.hour',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'workorder_id' =>$workorder_id,
- 'allrows'
=>$this->allrows,
- 'delete' =>true,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'workorder_id' => $workorder_id,
+ 'allrows' => $this->allrows,
+ 'delete' => true,
+ 'query' => $this->query
);
$table_add[] = array
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add a hour'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.edit_hour&template_id='
. $template_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.edit_hour','template_id'=> $template_id))
);
if(!$this->allrows)
@@ -500,7 +501,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.'.uitemplate.index&template_id='
. $template_id),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.index', 'template_id'=> $template_id)),
'lang_template_id'
=> lang('Template ID'),
'value_template_id'
=> $template_id,
@@ -527,7 +528,7 @@
'lang_chapter_statustext' =>
lang('Select the chapter (for tender) for this activity.'),
'lang_add'
=> lang('add a hour'),
'lang_add_statustext' =>
lang('add a hour to this template'),
- 'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.edit_hour&template_id='
. $template_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.edit_hour', 'template_id'=> $template_id))
);
$appname
= lang('Workorder template');
@@ -563,7 +564,6 @@
if(!$receipt['error'])
{
$receipt =
$this->bo->save_hour($values,$template_id);
-
$hour_id=$receipt['hour_id'];
}
}
@@ -598,7 +598,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.'.uitemplate.hour&template_id='
. $template_id),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.hour', 'template_id'=> $template_id)),
'lang_template'
=> lang('template'),
'value_template_id'
=> $template['template_id'],
'value_template_name' =>
$template['name'],
@@ -678,7 +678,7 @@
'lang_building_part_statustext' =>
lang('Select the building part for this activity.'),
- 'ns3420_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.ns3420'),
+ 'ns3420_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.ns3420')),
'lang_ns3420'
=> lang('NS3420'),
'value_ns3420_id'
=> $values['ns3420_id'],
'lang_ns3420_statustext' =>
lang('Select a standard-code from the norwegian standard'),
@@ -714,7 +714,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitemplate.delete&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitemplate.delete', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -729,6 +729,5 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
// $GLOBALS['phpgw']->xslttpl->pp();
}
-
}
?>
Index: class.uitenant_claim.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitenant_claim.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uitenant_claim.inc.php 17 Jun 2006 08:45:56 -0000 1.13
+++ class.uitenant_claim.inc.php 12 Sep 2006 13:09:02 -0000 1.14
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uitenant_claim.inc.php,v 1.13 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uitenant_claim.inc.php,v 1.14 2006/09/12 13:09:02
sigurdne Exp $
*/
/**
@@ -48,7 +48,7 @@
$this->menu =
CreateObject($this->currentapp.'.menu');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
- $this->acl2_location= '.tenant_claim';
+ $this->acl2_location = '.tenant_claim';
$this->acl_read =
$this->acl2->check($this->acl2_location,1);
$this->acl_add =
$this->acl2->check($this->acl2_location,2);
@@ -77,7 +77,7 @@
'filter' => $this->filter,
'status' => $this->status,
'cat_id' => $this->cat_id,
- 'this->allrows' => $this->allrows
+ 'allrows' => $this->allrows
);
$this->bo->save_sessiondata($data);
}
@@ -92,7 +92,7 @@
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
@@ -120,9 +120,9 @@
'name'
=> $name,
'entry_date'
=> $claim['entry_date'],
'category'
=> $claim['category'],
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.view&claim_id='
. $claim['claim_id']),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit&claim_id='
. $claim['claim_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.delete&claim_id='
. $claim['claim_id']),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.view', 'claim_id'=> $claim['claim_id'])),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.edit', 'claim_id'=> $claim['claim_id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.delete', 'claim_id'=> $claim['claim_id'])),
'lang_view_statustext' =>
lang('view the claim'),
'lang_edit_statustext' =>
lang('edit the claim'),
'lang_delete_statustext' =>
lang('delete the claim'),
@@ -205,12 +205,12 @@
if ($project_id)
{
$lang_add = lang('add another');
- $add_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.edit&project_id='
. $project_id);
+ $add_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.edit', 'project_id'=> $project_id));
}
else
{
$lang_add = lang('add');
- $add_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&lookup=true&from=tenant_claim');
+ $add_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index', 'lookup'=>true, 'from'=>'tenant_claim'));
}
@@ -224,12 +224,12 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uitenant_claim.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'status' =>$this->status,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'status' => $this->status,
+ 'query' => $this->query
);
if(!$this->allrows)
@@ -314,7 +314,7 @@
{
if(!$this->acl_add && !$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$this->acl2_location));
}
$claim_id =
get_var('claim_id',array('POST','GET'));
@@ -363,14 +363,14 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.index'));
}
}
}
if ($values['cancel'])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.index'));
}
@@ -479,7 +479,7 @@
(
'table_header_workorder' =>
$table_header_workorder,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view')),
'lang_start_date'
=> lang('Project start date'),
'value_start_date'
=> $project_values['start_date'],
@@ -501,7 +501,7 @@
'lang_reserve_remainder' =>
lang('reserve remainder'),
'value_reserve_remainder' =>
$reserve_remainder,
- 'value_reserve_remainder_percent'=>
$remainder_percent,
+ 'value_reserve_remainder_percent' =>
$remainder_percent,
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
@@ -552,7 +552,7 @@
'lang_amount_statustext' =>
lang('The total amount to claim'),
'value_amount'
=> $values['amount'],
- 'tenant_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.tenant'),
+ 'tenant_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.tenant')),
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
'value_last_name'
=> $values['last_name'],
@@ -593,7 +593,7 @@
if(!$this->acl_delete)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=8&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>8, 'acl_location'=>
$this->acl2_location));
}
@@ -617,7 +617,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.delete&claim_id='
. $claim_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.delete', 'claim_id'=> $claim_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -633,12 +633,11 @@
// $GLOBALS['phpgw']->xslttpl->pp();
}
-
function view()
{
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$claim_id =
get_var('claim_id',array('POST','GET'));
@@ -738,7 +737,7 @@
(
'table_header_workorder' =>
$table_header_workorder,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view')),
'lang_start_date'
=> lang('Project start date'),
'value_start_date'
=> $project_values['start_date'],
@@ -760,7 +759,7 @@
'lang_reserve_remainder' =>
lang('reserve remainder'),
'value_reserve_remainder' =>
$reserve_remainder,
- 'value_reserve_remainder_percent'=>
$remainder_percent,
+ 'value_reserve_remainder_percent' =>
$remainder_percent,
'location_data'
=> $location_data,
'location_type'
=> 'view',
@@ -822,7 +821,7 @@
'value_cat'
=> $values['cat'],
'cat_list'
=> $this->bocommon->select_category_list(array('format'=>'select','selected' =>
$values['cat_id'],'type' =>'tenant_claim','order'=>'descr')),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.index')),
'lang_done' => lang('done'),
'value_date' =>
$GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date'])
@@ -832,9 +831,5 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
// $GLOBALS['phpgw']->xslttpl->pp();
}
-
-
-
-
}
?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiworkorder.inc.php class.ui...,
Sigurd Nes <=