[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.sobud...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bocommon.inc.php class.sobud... |
|
Date: |
Wed, 13 Sep 2006 12:56:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/13 12:56:22
Modified files:
inc : class.bocommon.inc.php class.sobudget.inc.php
class.uiXport.inc.php class.uiactor.inc.php
class.uiagreement.inc.php class.uialarm.inc.php
class.uib_account.inc.php
class.uibudget.inc.php
class.uiinvestment.inc.php
class.uiinvoice.inc.php
class.uipricebook.inc.php
class.uir_agreement.inc.php
class.uis_agreement.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sobudget.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiXport.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiactor.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiagreement.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uialarm.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uib_account.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uibudget.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvestment.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiinvoice.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uipricebook.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uir_agreement.inc.php?cvsroot=phpgroupware&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uis_agreement.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
Patches:
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.bocommon.inc.php 6 Sep 2006 06:21:51 -0000 1.34
+++ class.bocommon.inc.php 13 Sep 2006 12:56:22 -0000 1.35
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.bocommon.inc.php,v 1.34 2006/09/06 06:21:51
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.35 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -582,7 +582,7 @@
}
}
- $vendor['vendor_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor');
+ $vendor['vendor_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor'));
$vendor['lang_vendor']
= lang('Vendor');
$vendor['lang_select_vendor_help'] =
lang('Klick this link to select vendor');
$vendor['lang_vendor_name']
= lang('Vendor Name');
@@ -607,7 +607,7 @@
$tenant['value_tenant_id'] =
$data['tenant_id'];
$tenant['value_first_name'] =
$data['first_name'];
$tenant['value_last_name'] =
$data['last_name'];
- $tenant['tenant_link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.tenant');
+ $tenant['tenant_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.tenant'));
if($data['role']=='customer')
{
$tenant['lang_select_tenant_help']
= lang('Klick this link to select customer');
@@ -661,7 +661,7 @@
$b_account['value_b_account_id']
= $data['b_account_id'];
$b_account['value_b_account_name']
= $data['b_account_name'];
- $b_account['b_account_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.b_account');
+ $b_account['b_account_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.b_account'));
$b_account['lang_select_b_account_help'] =
lang('Klick this link to select budget account');
$b_account['lang_b_account']
= lang('Budget account');
if($data['b_account_id'] && !$data['b_account_name'])
Index: class.sobudget.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sobudget.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.sobudget.inc.php 10 May 2006 11:10:20 -0000 1.20
+++ class.sobudget.inc.php 13 Sep 2006 12:56:22 -0000 1.21
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage budget
- * @version $Id: class.sobudget.inc.php,v 1.20 2006/05/10 11:10:20
sigurdne Exp $
+ * @version $Id: class.sobudget.inc.php,v 1.21 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -478,7 +478,7 @@
//_debug_array($obligations);
$this->db->query("select max(revision) as revision from
fm_budget_basis where year='$year'",__LINE__,__FILE__);
$this->db->next_record();
- $revision = $this->db->f('revision');
+ $revision = (int)$this->db->f('revision');
unset($filtermethod);
Index: class.uiXport.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiXport.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uiXport.inc.php 15 Feb 2006 14:37:37 -0000 1.17
+++ class.uiXport.inc.php 13 Sep 2006 12:56:22 -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 admin
- * @version $Id: class.uiXport.inc.php,v 1.17 2006/02/15 14:37:37
sigurdne Exp $
+ * @version $Id: class.uiXport.inc.php,v 1.18 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -66,7 +66,7 @@
{
if(!$this->acl_add)
{
-
$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));
}
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','import_receipt');
@@ -235,7 +235,7 @@
unset($payment_date);
unset($conv_type);
unset($auto_tax);
-//
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiXport.import');
+//
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiXport.import'));
}
else
{
@@ -280,10 +280,10 @@
'calendar_setup_payment'
=> "Calendar.setup({inputField : 'payment_date',ifFormat : '" . $jsDateFormat
. "',button : 'payment_date-trigger'});",
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'cancel_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&sub='.$sub),
+ 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.index', 'sub'=> $sub)),
'lang_cancel'
=> lang('Cancel'),
'lang_cancel_statustext' =>
lang('cancel the import'),
- 'action_url'
=> $GLOBALS['phpgw']->link('/index.php','menuaction='. $this->currentapp
.'.uiXport.import'),
+ 'action_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> $this->currentapp
.'.uiXport.import')),
'tsvfilename'
=> '',
'lang_debug'
=> lang('Debug output in browser'),
@@ -299,14 +299,12 @@
'lang_invoice_number' =>
lang('Invoice Number'),
'lang_invoice_num_statustext' => lang('Enter
Invoice Number'),
-
'lang_select'
=> lang('Select per button !'),
'lang_kidnr'
=> lang('KID nr'),
'lang_kid_nr_statustext' =>
lang('Enter Kid nr'),
-
'lang_vendor'
=> lang('Vendor'),
- 'addressbook_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor'),
+ 'addressbook_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor')),
'lang_invoice_date_statustext' => lang('Enter
the invoice date'),
'lang_num_days_statustext' =>
lang('Enter the payment date or the payment delay'),
@@ -372,7 +370,7 @@
'lang_budget_responsible' =>
lang('B - responsible'),
'budget_responsible_list' =>
$this->bocommon->get_user_list_right(128,$budget_responsible,'.invoice'),
'select_budget_responsible' =>
'budget_responsible',
- 'lang_select_budget_responsible'=> lang('Select
B-Responsible'),
+ 'lang_select_budget_responsible'
=> lang('Select B-Responsible'),
'lang_budget_responsible_statustext'
=> lang('You have to select a budget responsible for this invoice in order to
make the import')
);
@@ -504,7 +502,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('invoice','menu',
@@ -532,7 +530,7 @@
$GLOBALS['phpgw_info']['flags']['xslt_app'] = False;
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
echo '<pre>' .
$receipt['message'][0]['msg'] . '</pre>';
- echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.export')
. '">' . lang('Back') . '</a>';
+ echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiXport.export')) . '">' . lang('Back') . '</a>';
}
}
endif;
@@ -569,7 +567,7 @@
'lang_conv_statustext' =>
lang('Select conversion'),
'lang_rollback_file' =>
lang('Roll back'),
- 'link_rollback_file' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiXport.rollback'),
+ 'link_rollback_file' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiXport.rollback')),
'lang_export_to_file' =>
lang('Export to file'),
'value_debug'
=> $values['debug'],
@@ -597,7 +595,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('invoice','menu',
Index: class.uiactor.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiactor.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.uiactor.inc.php 17 Jun 2006 08:45:56 -0000 1.19
+++ class.uiactor.inc.php 13 Sep 2006 12:56:22 -0000 1.20
@@ -8,10 +8,9 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uiactor.inc.php,v 1.19 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uiactor.inc.php,v 1.20 2006/09/13 12:56:22
sigurdne Exp $
*/
-
/**
* uiactor class
*
@@ -66,6 +65,7 @@
$this->acl_add =
$this->acl2->check($this->acl2_location,2);
$this->acl_edit =
$this->acl2->check($this->acl2_location,4);
$this->acl_delete =
$this->acl2->check($this->acl2_location,8);
+ $this->acl_manage =
$this->acl2->check($this->acl2_location,16);
$this->start = $this->bo->start;
$this->query = $this->bo->query;
@@ -83,7 +83,7 @@
);
if(!$valid_role[$this->role])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index'));
}
}
@@ -165,7 +165,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('actor',
@@ -203,19 +203,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.view&actor_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.view', 'actor_id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_edit)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
actor');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.edit&actor_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.edit', 'actor_id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_delete)
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
actor');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.delete&actor_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.delete', 'actor_id'=> $entry['id'], 'role'=>
$this->role));
}
$j++;
@@ -239,13 +239,13 @@
'var' =>
$uicols['name'][$i],
'order' =>
$this->order,
'extra'
=> array('menuaction' => $this->currentapp.'.uiactor.index',
-
'query' =>$this->query,
-
'lookup' =>$lookup,
+
'query' => $this->query,
+
'lookup' => $lookup,
'district_id' => $this->district_id,
'start_date' => $start_date,
'role' => $this->role,
'member_id' => $this->member_id,
-
'end_date'=>$end_date)
+
'end_date' => $end_date)
));
}
}
@@ -279,7 +279,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add an
actor'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.edit&role='
. $this->role)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.edit', 'role'=> $this->role))
);
}
@@ -360,6 +360,12 @@
function edit()
{
+
+ if(!$this->acl_edit)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$this->acl2_location));
+ }
+
$actor_id =
get_var('actor_id',array('POST','GET'));
$values = get_var('values',array('POST'));
$values_attribute =
get_var('values_attribute',array('POST'));
@@ -410,13 +416,13 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','actor_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiactor.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.index', 'role'=> $this->role));
}
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiactor.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.index', 'role'=> $this->role));
}
}
@@ -513,6 +519,11 @@
function delete()
{
+ if(!$this->acl_delete)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>8, 'acl_location'=>
$this->acl2_location));
+ }
+
$attrib = get_var('attrib',array('POST','GET'));
$id = get_var('id',array('POST','GET'));
$actor_id =
get_var('actor_id',array('POST','GET'));
@@ -545,7 +556,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.delete&actor_id='
. $actor_id. '&id=' . $id . '&attrib=' . $attrib . '&role=' . $this->role),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.delete', 'actor_id'=> $actor_id, 'id'=> $id,
'attrib'=> $attrib, 'role'=> $this->role)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -565,6 +576,11 @@
function view()
{
+ if(!$this->acl_read)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$this->acl2_location));
+ }
+
$actor_id = get_var('actor_id',array('GET'));
$action = get_var('action',array('GET'));
@@ -591,7 +607,7 @@
(
'lang_actor_id' =>
lang($this->role) . ' ID',
'value_actor_id' =>
$actor_id,
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.index&role='
. $this->role),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.index', 'role'=> $this->role)),
'lang_category' =>
lang('category'),
'lang_time_created' =>
lang('time created'),
'lang_done'
=> lang('done'),
@@ -613,6 +629,12 @@
function list_attribute()
{
+
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>16, 'acl_location'=>
$this->acl2_location));
+ }
+
$id = get_var('id',array('POST','GET'));
$resort = get_var('resort',array('POST','GET'));
@@ -639,10 +661,10 @@
'input_text'
=> $attrib['input_text'],
'sorting'
=> $attrib['attrib_sort'],
'search'
=> $attrib['search'],
- 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.list_attribute&resort=up&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.list_attribute&resort=down&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.edit_attrib&id='
. $attrib['id'] . '&role=' . $this->role),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.delete&id='
. $attrib['id'].'&attrib=true&role=' . $this->role),
+ 'link_up' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.list_attribute', 'resort'=> 'up', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_down' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.list_attribute', 'resort'=> 'down', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.edit_attrib', 'id'=> $attrib['id'], 'role'=>
$this->role)),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.delete', 'id'=> $attrib['id'], 'attrib'=> true,
'role'=> $this->role)),
'lang_view_attribtext' =>
lang('view the attrib'),
'lang_attribute_attribtext' =>
lang('attributes for the attrib'). ' ' . lang('location'),
'lang_edit_attribtext' =>
lang('edit the attrib'),
@@ -671,7 +693,7 @@
'var' => 'attrib_sort',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiactor.list_attribute',
-
'allrows'=>$this->allrows,
+
'allrows'=> $this->allrows,
'role' => $this->role)
)),
@@ -681,7 +703,7 @@
'var' => 'column_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiactor.list_attribute',
-
'allrows'=>$this->allrows,
+
'allrows'=> $this->allrows,
'role' => $this->role)
)),
'lang_name' => lang('Name'),
@@ -691,7 +713,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_attribtext' => lang('add an
attrib'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiactor.edit_attrib&role='
. $this->role),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.edit_attrib', 'role'=> $this->role)),
'lang_done' =>
lang('done'),
'lang_done_attribtext' => lang('back to
admin'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
@@ -745,6 +767,11 @@
function edit_attrib()
{
+ if(!$this->acl_manage)
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>16, 'acl_location'=>
$this->acl2_location));
+ }
+
$id =
get_var('id',array('POST','GET'));
$values = get_var('values',array('POST'));
// $GLOBALS['phpgw']->common->msgbox(lang('Altering
ColumnName OR Datatype - deletes your data in this Column'));
@@ -859,10 +886,10 @@
'value_choice' =>
$values['choice'],
'lang_delete_value' =>
lang('Delete value'),
'lang_value' =>
lang('value'),
- 'lang_delete_choice_statustext'=> lang('Delete
this value from the list of multiple choice'),
+ 'lang_delete_choice_statustext' => lang('Delete
this value from the list of multiple choice'),
//'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.'.uiactor.list_attribute&type_id='.$type_id
. '&role=' . $this->role),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.list_attribute', 'type_id'=> $type_id, 'role'=>
$this->role)),
'lang_id'
=> lang('Attribute ID'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -880,7 +907,7 @@
'lang_entity_statustext' => lang('Select
a actor type'),
'lang_statustext' =>
lang('Statustext'),
- 'lang_statustext_attribtext'=> lang('Enter a
statustext for the inputfield in forms'),
+ 'lang_statustext_attribtext' => lang('Enter
a statustext for the inputfield in forms'),
'value_statustext' =>
$values['statustext'],
'lang_done_attribtext' => lang('Back
to the list'),
Index: class.uiagreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiagreement.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.uiagreement.inc.php 17 Jun 2006 08:45:56 -0000 1.23
+++ class.uiagreement.inc.php 13 Sep 2006 12:56:22 -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 agreement
- * @version $Id: class.uiagreement.inc.php,v 1.23 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uiagreement.inc.php,v 1.24 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -32,7 +32,7 @@
'view' => True,
'edit' => True,
'delete' => True,
- 'list_attribute'=> True,
+ 'list_attribute' => True,
'edit_attrib' => True,
'columns' => True,
'edit_item' => True,
@@ -59,7 +59,7 @@
$this->cats->app_name = 'fm_vendor';
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
- $this->acl2_location= '.pricebook';
+ $this->acl2_location = '.pricebook';
$this->acl_read =
$this->acl2->check($this->acl2_location,1);
$this->acl_add =
$this->acl2->check($this->acl2_location,2);
@@ -151,7 +151,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')));
@@ -190,7 +190,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('agreement',
@@ -228,19 +228,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.view&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.view','id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_edit)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit','id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_delete)
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
agreement');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.delete&agreement_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.delete', 'agreement_id'=> $entry['id'],
'role'=> $this->role));
}
$j++;
@@ -264,8 +264,8 @@
'var' =>
$uicols['name'][$i],
'order' =>
$this->order,
'extra'
=> array('menuaction' => $this->currentapp.'.uiagreement.index',
-
'query' =>$this->query,
-
'lookup' =>$lookup,
+
'query' => $this->query,
+
'lookup' => $lookup,
'district_id' => $this->district_id,
'start_date' => $start_date,
'role' => $this->role,
@@ -307,7 +307,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add an
agreement'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&role='
. $this->role)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'role'=> $this->role))
);
}
@@ -418,19 +418,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.view_item&agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.view_item', 'agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_edit && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_item&agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_delete && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('delete this
item');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&delete_item=1&agreement_id='
. $entry['agreement_id'] .'&activity_id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit','delete_item'=>1, 'agreement_id'=>
$entry['agreement_id'], 'activity_id'=> $entry['id']));
}
$j++;
@@ -499,12 +499,12 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'id'=> $agreement_id));
}
}
else
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'id'=> $agreement_id));
}
}
@@ -537,7 +537,7 @@
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
- 'add_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.add_activity&group_id='
. $group_id . '&agreement_id=' . $agreement_id),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.add_activity', 'group_id'=> $group_id,
'agreement_id'=> $agreement_id)),
'agreement_id'
=> $agreement_id,
'table_header'
=> $table_header,
'values'
=> $content,
@@ -664,7 +664,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.index', 'role'=> $this->role));
}
}
}
@@ -718,7 +718,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.index', 'role'=> $this->role));
}
endif;
}
@@ -746,19 +746,19 @@
{
$content[$j]['lang_view_statustext'] = lang('view the entity');
$content[$j]['text_view'] = lang('view');
-
$content[$j]['link_view'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.view_item&agreement_id='
. $id .'&id=' . $content[$j]['activity_id']);
+
$content[$j]['link_view'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.view_item', 'agreement_id'=> $id, 'id'=>
$content[$j]['activity_id']));
}
if($this->acl_edit &&
!$edit_item && !$view_only)
{
$content[$j]['lang_edit_statustext'] = lang('edit the agreement');
$content[$j]['text_edit'] = lang('edit');
-
$content[$j]['link_edit'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_item&agreement_id='
. $id .'&id=' . $content[$j]['activity_id']);
+
$content[$j]['link_edit'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=> $id, 'id'=>
$content[$j]['activity_id']));
}
if($this->acl_delete &&
!$edit_item && !$view_only)
{
$content[$j]['lang_delete_statustext'] = lang('delete this item');
$content[$j]['text_delete'] = lang('delete');
-
$content[$j]['link_delete'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&delete_item=1&id='
. $id .'&activity_id=' . $content[$j]['activity_id']);
+
$content[$j]['link_delete'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'delete_item'=>1, 'id'=> $id,
'activity_id'=> $content[$j]['activity_id']));
}
$content[$j]['acl_manage']
= $this->acl_manage;
@@ -836,7 +836,6 @@
'lang_update_statustext'
=> lang('update selected investments')
);
}
-
}
$link_data = array
@@ -907,7 +906,7 @@
(
'lang_add' =>
lang('add detail'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.add_activity&agreement_id='
. $id . '&group_id=' . $agreement['group_id'])
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.add_activity', 'agreement_id'=> $id,
'group_id'=> $agreement['group_id']))
);
@@ -1036,7 +1035,7 @@
'values'
=> $content,
'table_header'
=> $table_header,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $id),
+ 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -1141,7 +1140,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'id'=> $agreement_id));
}
}
}
@@ -1166,7 +1165,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit&id='
. $agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit', 'id'=> $agreement_id));
}
endif;
}
@@ -1222,7 +1221,7 @@
(
'lang_add' =>
lang('add detail'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_item&agreement_id='
. $agreement_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=> $agreement_id))
);
@@ -1300,7 +1299,7 @@
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_item&agreement_id='
. $agreement_id . '&id=' . $id),
+ 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'agreement_id'=> $agreement_id,
'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -1319,7 +1318,7 @@
'set_column'
=> $set_column,
'lang_delete_last'
=> lang('delete last index'),
'lang_delete_last_statustext' => lang('delete
the last index'),
- 'delete_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_item&delete_last=1&agreement_id='
. $agreement_id . '&id=' . $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_item', 'delete_last'=>1, 'agreement_id'=>
$agreement_id, 'id'=> $id)),
);
@@ -1442,7 +1441,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.delete&agreement_id='
. $agreement_id. '&id=' . $id . '&attrib=' . $attrib . '&role=' . $this->role),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.delete', 'agreement_id'=> $agreement_id, 'id'=>
$id, 'attrib'=> $attrib, 'role'=> $this->role)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1648,10 +1647,10 @@
'input_text'
=> $attrib['input_text'],
'sorting'
=> $attrib['attrib_sort'],
'search'
=> $attrib['search'],
- 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.list_attribute&resort=up&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.list_attribute&resort=down&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_attrib&id='
. $attrib['id'] . '&role=' . $this->role),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.delete&id='
. $attrib['id'].'&attrib=true&role=' . $this->role),
+ 'link_up'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.list_attribute', 'resort'=>'up', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_down'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.list_attribute', 'resort'=> 'down', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_attrib', 'id'=> $attrib['id'],
'role'=>$this->role)),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.delete', 'id'=> $attrib['id'], 'attrib'=> true,
'role'=> $this->role)),
'lang_view_attribtext' =>
lang('view the attrib'),
'lang_attribute_attribtext' =>
lang('attributes for the attrib'). ' ' . lang('location'),
'lang_edit_attribtext' =>
lang('edit the attrib'),
@@ -1680,7 +1679,7 @@
'var' => 'attrib_sort',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiagreement.list_attribute',
-
'allrows'=>$this->allrows,
+
'allrows'=> $this->allrows,
'role' => $this->role)
)),
@@ -1690,7 +1689,7 @@
'var' => 'column_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiagreement.list_attribute',
-
'allrows'=>$this->allrows,
+
'allrows'=> $this->allrows,
'role' => $this->role)
)),
'lang_name' => lang('Name'),
@@ -1700,7 +1699,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_attribtext' => lang('add an
attrib'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiagreement.edit_attrib&role='
. $this->role),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.edit_attrib', 'role'=> $this->role)),
'lang_done' =>
lang('done'),
'lang_done_attribtext' => lang('back to
admin'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
@@ -1868,10 +1867,10 @@
'value_choice' =>
$values['choice'],
'lang_delete_value' =>
lang('Delete value'),
'lang_value' =>
lang('value'),
- 'lang_delete_choice_statustext'=> lang('Delete
this value from the list of multiple choice'),
+ 'lang_delete_choice_statustext' =>
lang('Delete this value from the list of multiple choice'),
'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.'.uiagreement.list_attribute&type_id='.$type_id
. '&role=' . $this->role),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiagreement.list_attribute', 'type_id'=> $type_id, 'role'=>
$this->role)),
'lang_id'
=> lang('Attribute ID'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -1889,7 +1888,7 @@
'lang_entity_statustext' => lang('Select
a agreement type'),
'lang_statustext' =>
lang('Statustext'),
- 'lang_statustext_attribtext'=> lang('Enter a
statustext for the inputfield in forms'),
+ 'lang_statustext_attribtext' =>
lang('Enter a statustext for the inputfield in forms'),
'value_statustext' =>
$values['statustext'],
'lang_done_attribtext' => lang('Back
to the list'),
@@ -1923,7 +1922,7 @@
'value_search' =>
$values['search'],
'lang_include_search' =>
lang('Include in search'),
- 'lang_include_search_statustext'=> lang('check
to show this attribute in location list'),
+ 'lang_include_search_statustext' =>
lang('check to show this attribute in location list'),
);
Index: class.uialarm.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uialarm.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.uialarm.inc.php 22 Jun 2006 13:57:38 -0000 1.14
+++ class.uialarm.inc.php 13 Sep 2006 12:56:22 -0000 1.15
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uialarm.inc.php,v 1.14 2006/06/22 13:57:38
sigurdne Exp $
+ * @version $Id: class.uialarm.inc.php,v 1.15 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -126,7 +126,7 @@
if (substr($alarm['id'],0,8)=='fm_async')
{
- $link_edit
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uialarm.edit&async_id='
. urlencode($alarm['id']));
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.edit', 'async_id'=> urlencode($alarm['id'])));
$lang_edit_statustext =
lang('edit the alarm');
$text_edit
= lang('edit');
}
@@ -170,8 +170,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_method' =>
$this->nextmatchs->show_sort_order(array
(
@@ -180,8 +180,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_next_run' =>
$this->nextmatchs->show_sort_order(array
(
@@ -190,8 +190,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_alarm_id' =>
$this->nextmatchs->show_sort_order(array
(
@@ -200,8 +200,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.index',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
))
);
@@ -217,7 +217,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add an alarm'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uialarm.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.edit'))
);
$link_data = array
@@ -341,7 +341,7 @@
if($id[0] == 's_agreement' || $id[0] ==
'agreement')
{
- $link_edit
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui'
.$id[0] .'.edit&id=' . $id[1]);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.ui' .$id[0] .'.edit', 'id'=> $id[1]));
$lang_edit_statustext
= lang('edit the alarm');
$text_edit
= lang('edit');
@@ -386,8 +386,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.list_alarm',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_method' =>
$this->nextmatchs->show_sort_order(array
(
@@ -396,8 +396,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.list_alarm',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_next_run' =>
$this->nextmatchs->show_sort_order(array
(
@@ -406,8 +406,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.list_alarm',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
)),
'sort_alarm_id' =>
$this->nextmatchs->show_sort_order(array
(
@@ -416,8 +416,8 @@
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uialarm.list_alarm',
'cat_id' =>
$this->cat_id,
-
'query'
=>$this->query,
-
'allrows'
=>$this->allrows)
+
'query' =>
$this->query,
+
'allrows' =>
$this->allrows)
))
);
@@ -433,7 +433,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add an alarm'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uialarm.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.edit'))
);
$link_data = array
@@ -549,14 +549,14 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','alarm_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uialarm.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.index'));
}
}
}
if ($values['cancel'])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uialarm.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uialarm.index'));
}
if ($async_id)
@@ -641,7 +641,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiowner.delete&owner_id='
. $owner_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiowner.delete', 'owner_id'=> $owner_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -672,7 +672,7 @@
$data = array
(
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiowner.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiowner.index')),
'lang_name' => lang('name'),
'lang_category' => lang('category'),
'lang_time_created' => lang('time created'),
Index: class.uib_account.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uib_account.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uib_account.inc.php 17 Jun 2006 08:45:56 -0000 1.13
+++ class.uib_account.inc.php 13 Sep 2006 12:56:22 -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 admin
- * @version $Id: class.uib_account.inc.php,v 1.13 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uib_account.inc.php,v 1.14 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -77,7 +77,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('b_account','nextmatchs','menu',
@@ -94,12 +94,12 @@
if($this->acl_edit)
{
- $link_edit
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.edit&id='
. $b_account['id']);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.edit', 'id'=> $b_account['id']));
}
if($this->acl_delete)
{
- $link_delete
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.delete&id='
. $b_account['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.delete', 'id'=> $b_account['id']));
}
$content[] = array
@@ -126,8 +126,7 @@
'lang_descr' => lang('Descr'),
'lang_edit' => lang('edit'),
'lang_delete' => lang('delete'),
- 'sort_id' =>
$this->nextmatchs->show_sort_order(array
-
(
+ 'sort_id' =>
$this->nextmatchs->show_sort_order(array(
'sort' => $this->sort,
'var' => 'id',
'order' => $this->order,
@@ -140,7 +139,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_b_accounttext' => lang('add a
budget account'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.edit'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.edit')),
'lang_done'
=> lang('done'),
'lang_done_b_accounttext' => lang('back
to admin'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php')
@@ -165,7 +164,7 @@
'record_limit'
=> $record_limit,
'num_records'
=> count($b_account_list),
'all_records'
=> $this->bo->total_records,
- 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.index&type='.$type),
+ 'link_url' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.index', 'type'=> $type)),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
'lang_searchfield_b_accounttext' =>
lang('Enter the search string. To show all entries, empty this field and press
the SUBMIT button again'),
'lang_searchbutton_b_accounttext' =>
lang('Submit the search string'),
@@ -189,7 +188,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'));
@@ -247,7 +246,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.'.uib_account.index&type='.$type),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.index', 'type'=> $type)),
'lang_id' =>
lang('budget account'),
'lang_descr' =>
lang('Descr'),
'lang_save' =>
lang('save'),
@@ -282,7 +281,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'));
@@ -304,7 +303,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uib_account.delete&id='
. $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uib_account.delete', 'id'=> $id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_b_accounttext' => lang('Delete
the entry'),
Index: class.uibudget.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uibudget.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.uibudget.inc.php 10 May 2006 11:10:20 -0000 1.19
+++ class.uibudget.inc.php 13 Sep 2006 12:56:22 -0000 1.20
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage budget
- * @version $Id: class.uibudget.inc.php,v 1.19 2006/05/10 11:10:20
sigurdne Exp $
+ * @version $Id: class.uibudget.inc.php,v 1.20 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -96,7 +96,7 @@
if(!$acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('budget',
@@ -126,8 +126,8 @@
'district_id'
=> $entry['district_id'],
'revision'
=> $entry['revision'],
'budget_cost'
=> $entry['budget_cost'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.edit&budget_id='
. $entry['budget_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.delete&budget_id='
. $entry['budget_id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.edit', 'budget_id'=> $entry['budget_id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.delete', 'budget_id'=> $entry['budget_id'])),
'lang_edit_text'
=> lang('edit the budget record'),
'lang_delete_text'
=> lang('delete the budget record'),
'text_edit'
=> lang('edit'),
@@ -206,15 +206,13 @@
)),
);
-
-
if($acl_add)
{
$table_add = array
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
budget query'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.edit'))
);
}
@@ -282,14 +280,10 @@
'revision_list' =>
$this->bo->get_revision_filter_list($this->revision),
'lang_no_revision' =>
lang('no revision'),
'lang_revision_statustext' =>
lang('Select the revision the selection belongs to'),
-
);
-
-
$this->save_sessiondata();
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('budget') . ': ' . lang('list budget');
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
}
@@ -307,7 +301,7 @@
if(!$acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('budget',
@@ -335,8 +329,8 @@
'district_id'
=> $entry['district_id'],
'revision'
=> $entry['revision'],
'budget_cost'
=> $entry['budget_cost'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.edit_basis&budget_id='
. $entry['budget_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.delete_basis&budget_id='
. $entry['budget_id']),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.edit_basis', 'budget_id'=> $entry['budget_id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.delete_basis', 'budget_id'=> $entry['budget_id'])),
'lang_edit_text'
=> lang('edit the budget record'),
'lang_delete_text'
=> lang('delete the budget record'),
'text_edit'
=> lang('edit'),
@@ -421,7 +415,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
budget query'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.edit_basis')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.edit_basis'))
);
}
@@ -489,7 +483,6 @@
'revision_list' =>
$revision_list,
'lang_no_revision' =>
lang('no revision'),
'lang_revision_statustext' =>
lang('Select the revision the selection belongs to'),
-
);
$this->save_sessiondata();
@@ -508,7 +501,7 @@
if(!$acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>1, 'acl_location'=>
$acl2_location));
}
$GLOBALS['phpgw']->xslttpl->add_file(array('budget',
@@ -537,9 +530,9 @@
'grouping'
=> $entry['grouping'],
'district_id'
=> $entry['district_id'],
'obligation'
=> number_format($entry['obligation'], 0, ',', ' '),
- 'link_obligation'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.index&filter=all&paid=1&district_id='
. $entry['district_id'] . '&b_group=' . $entry['grouping']),
+ 'link_obligation'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.index', 'filter'=>'all', 'paid'=>1,
'district_id'=> $entry['district_id'], 'b_group'=> $entry['grouping'])),
'actual_cost'
=> number_format($entry['actual_cost'], 0, ',', ' '),
- 'link_actual_cost'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.consume&district_id='
. $entry['district_id'] . '&b_account_class=' . $entry['grouping'] .
'&start_date=' . $start_date . '&end_date=' . $end_date .
'&submit_search=true'),
+ 'link_actual_cost'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.consume', 'district_id'=> $entry['district_id'],
'b_account_class'=> $entry['grouping'], 'start_date'=> $start_date,
'end_date'=> $end_date, 'submit_search'=>true)),
'diff'
=> number_format($entry['budget_cost'] - $entry['actual_cost'] -
$entry['obligation'], 0, ',', ' '),
'hits'
=> number_format($entry['hits'], 0, ',', ' '),
@@ -577,7 +570,7 @@
'year' =>$this->year,
'period' =>$this->period,
'grouping'
=>$this->grouping,
-
'allrows'=>$this->allrows)
+
'allrows'
=>$this->allrows)
)),
);
@@ -587,7 +580,7 @@
(
'lang_add' => lang('add'),
'lang_add_statustext' => lang('add a
budget query'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.edit_obligations')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.edit_obligations'))
);
}
@@ -657,9 +650,7 @@
$this->save_sessiondata();
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('budget') . ': ' . lang('list obligations');
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_obligations' => $data));
-
}
@@ -671,7 +662,7 @@
if(!$acl_add && !$acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$acl2_location));
}
$budget_id =
get_var('budget_id',array('POST','GET'));
@@ -711,7 +702,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','budget_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uibudget.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.index'));
}
}
else
@@ -728,7 +719,7 @@
if ($values['cancel'])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uibudget.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.index'));
}
@@ -818,7 +809,7 @@
if(!$acl_add && !$acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>2, 'acl_location'=>
$acl2_location));
}
$budget_id =
get_var('budget_id',array('POST','GET'));
@@ -854,7 +845,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','budget_basis_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uibudget.basis');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.basis'));
}
}
else
@@ -873,7 +864,7 @@
if ($values['cancel'])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uibudget.basis');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.basis'));
}
if ($budget_id)
@@ -973,7 +964,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.delete&budget_id='
. $budget_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.delete', 'budget_id'=> $budget_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1011,7 +1002,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.delete_basis&budget_id='
. $budget_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.delete_basis', 'budget_id'=> $budget_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1122,7 +1113,7 @@
'table_header'
=> $table_header,
'values'
=> $content,
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uibudget.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uibudget.index')),
'lang_done' => lang('done'),
);
Index: class.uiinvestment.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvestment.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uiinvestment.inc.php 17 Jun 2006 08:45:56 -0000 1.13
+++ class.uiinvestment.inc.php 13 Sep 2006 12:56:22 -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 eco
- * @version $Id: class.uiinvestment.inc.php,v 1.13 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uiinvestment.inc.php,v 1.14 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -85,7 +85,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('investment',
@@ -153,7 +153,7 @@
'index_count'
=> $investment['index_count'],
'entity_name'
=> $investment['entity_name'],
'this_write_off'
=> number_format($investment['this_write_off'], 0, ',', ''),
- 'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $investment['entity_id'].'&investment_id=' .
$investment['investment_id'].'&entity_type=' . $this->cat_id),
+ 'link_history'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.history', 'entity_id'=>
$investment['entity_id'], 'investment_id'=> $investment['investment_id'],
'entity_type'=> $this->cat_id)),
'lang_history'
=> lang('History'),
'lang_history_statustext' =>
lang('View/Edit the history'),
'is_admin'
=> $this->admin_invoice
@@ -204,7 +204,7 @@
(
'lang_add' =>
lang('Add'),
'lang_add_statustext' => lang('add an
investment'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.add')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.add'))
);
$link_data = array
@@ -239,7 +239,7 @@
'lang_search'
=> lang('Search'),
'lang_search_statustext' =>
lang('Search for investment entries'),
// 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'form_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index'),
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.index')),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -272,7 +272,7 @@
'sum_value'
=> number_format($sum_value, 0, ',', ''),
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index'),
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.index')),
'table_add'
=> $table_add
);
@@ -361,7 +361,7 @@
'current_index'
=> $investment['current_index'],
'index_count'
=> $investment['index_count'],
'this_write_off'
=> number_format($investment['this_write_off'], 0, ',', ''),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.delete&entity_id='
. $entity_id.'&investment_id=' . $investment_id.'&index_count=' .
$investment['index_count'].'&entity_type='.$entity_type),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.delete', 'entity_id'=> $entity_id,
'investment_id'=> $investment_id, 'index_count'=> $investment['index_count'],
'entity_type'=> $entity_type)),
'lang_delete'
=> lang('Delete'),
'lang_delete_statustext' =>
lang('Delete last entry'),
'is_admin'
=> $this->admin_invoice
@@ -404,7 +404,7 @@
(
'lang_done' =>
lang('done'),
'lang_done_statustext' => lang('Back to
investment list '),
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index&preserve=1')
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.index', 'preserve'=>1))
);
$link_data = array
@@ -450,14 +450,14 @@
'record_limit'
=> $record_limit,
'num_records'
=> count($investment_list),
'all_records'
=> $this->bo->total_records,
- 'link_url'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $entity_id.'&investment_id=' . $investment_id . '&entity_type=' .
$entity_type),
+ 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.history', 'entity_id'=> $entity_id,
'investment_id'=> $investment_id, 'entity_type'=> $entity_type)),
'img_path'
=> $GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
'entity_id'
=> $entity_id,
'investment_id'
=> $investment_id,
'table_header_history' =>
$table_header,
'values_history'
=> $content,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.history&entity_id='
. $entity_id.'&investment_id=' . $investment_id . '&entity_type=' .
$entity_type),
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.history', 'entity_id'=> $entity_id,
'investment_id'=> $investment_id, 'entity_type'=> $entity_type)),
'table_done'
=> $table_done
);
@@ -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));
}
$values =
get_var('values',array('POST'));
$values['date'] =
get_var('date',array('POST'));
@@ -598,10 +598,10 @@
'lang_date'
=> lang('Date'),
'lang_location'
=> lang('Location'),
- 'lang_select_location_statustext'=>
lang('select either a location or an entity'),
+ 'lang_select_location_statustext' =>
lang('select either a location or an entity'),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.index&preserve=1'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.index', 'preserve'=>1)),
'lang_write_off_period' =>
lang('Write off period'),
'lang_new'
=> lang('New'),
@@ -616,7 +616,6 @@
'filter_name'
=> 'values[type]',
'lang_filter_statustext' =>
lang('Select the type of value'),
'lang_show_all'
=> lang('Select'),
-
'lang_name'
=> lang('name'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -670,7 +669,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvestment.delete&entity_id='
. $entity_id.'&investment_id=' . $investment_id.'&index_count=' .
$index_count.'&entity_type='.$entity_type),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvestment.delete', 'entity_id'=> $entity_id,
'investment_id'=> $investment_id, 'index_count'=> $index_count, 'entity_type'=>
$entity_type)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
Index: class.uiinvoice.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiinvoice.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.uiinvoice.inc.php 3 Jul 2006 12:21:12 -0000 1.36
+++ class.uiinvoice.inc.php 13 Sep 2006 12:56:22 -0000 1.37
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage eco
- * @version $Id: class.uiinvoice.inc.php,v 1.36 2006/07/03 12:21:12
sigurdne Exp $
+ * @version $Id: class.uiinvoice.inc.php,v 1.37 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -65,7 +65,6 @@
$this->allrows =
$this->bo->allrows;
$this->district_id =
$this->bo->district_id;
-
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
$this->acl2_location = '.invoice';
@@ -75,7 +74,6 @@
$this->acl_delete =
$this->acl2->check('.invoice',8);
$this->menu->sub ='invoice';
-
}
function save_sessiondata()
@@ -135,7 +133,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('invoice','menu',
@@ -182,21 +180,21 @@
$sum
= $sum + $extra['amount'];
$content[$i]['amount'] =
number_format($extra['amount'], 2, ',', ' ');
$content[$i]['lang_payment_date']
= lang('Payment Date');
- $content[$i]['link_sub']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.list_sub&user_lid='.$this->user_lid
. '&query=' . $this->query);
+ $content[$i]['link_sub']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.list_sub', 'user_lid'=> $this->user_lid,
'query'=> $this->query));
$content[$i]['lang_sub']
= lang('Voucher ID');
$content[$i]['lang_sub_help']
= lang('Klick this link to enter the list of sub-invoices');
- $content[$i]['link_period']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.edit_period');
+ $content[$i]['link_period']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.edit_period'));
$content[$i]['lang_period']
= lang('Period');
$content[$i]['lang_period_help']
= lang('Klick this link to edit the period');
if($this->acl_delete && !$paid)
{
- $content[$i]['link_delete']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.delete&voucher_id='
. $extra['voucher_id']);
+ $content[$i]['link_delete']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.delete', 'voucher_id'=> $extra['voucher_id']));
$content[$i]['lang_delete_statustext'] = lang('delete the voucher');
$content[$i]['text_delete']
= lang('delete');
}
- $content[$i]['link_front']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.receipt&voucher_id='
. $extra['voucher_id']);
+ $content[$i]['link_front']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.receipt', 'voucher_id'=> $extra['voucher_id']));
$content[$i]['lang_front_statustext']
= lang('A printout version of the frontpage');
$content[$i]['text_front']
= 'F';
@@ -211,9 +209,10 @@
'sort' => $this->sort,
'var' => 'bilagsnr',
'order' => $this->order,
-
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.index',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'extra' => array(
+
'menuaction' =>
$this->currentapp.'.uiinvoice.index',
+
'cat_id' =>
$this->cat_id,
+
'sub' => $this->sub,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'user_lid'
=> $this->user_lid,
@@ -230,8 +229,8 @@
'var' => 'fakturadato',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.index',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'cat_id'
=> $this->cat_id,
+
'sub'
=> $this->sub,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'user_lid'
=> $this->user_lid,
@@ -250,8 +249,8 @@
'var' => 'spvend_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.index',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'cat_id'
=> $this->cat_id,
+
'sub'
=> $this->sub,
'paid'
=> $paid,
'vendor_id'
=> $vendor_id,
'user_lid'
=> $this->user_lid,
@@ -307,7 +306,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add an
invoice'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.add')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.add'))
);
}
@@ -386,14 +385,13 @@
{
$bolocation =
CreateObject($this->currentapp.'.bolocation');
$data['user_list']
=
$this->bo->get_invoice_user_list('select',$this->user_lid,array('all'),$default='all');
-
$location_data=$bolocation->initiate_ui_location(array('type_id'=> 1));
+ $location_data
= $bolocation->initiate_ui_location(array('type_id'=> 1));
$data['cat_list']
= $this->bo->select_category('select',$this->cat_id);
$data['start_date'] = $start_date;
$data['end_date'] = $end_date;
$data['vendor_id'] = $vendor_id;
-
$data['jsDateFormat']
= $jsDateFormat;
$data['date_img']
= $cal_info['img'];
$data['lang_datetitle']
= lang('Select date');
@@ -404,11 +402,11 @@
$data['lang_workorder_statustext']
= lang('enter the Workorder ID to search by workorder - at any date');
$data['workorder_id']
= $workorder_id;
- $data['addressbook_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor');
+ $data['addressbook_link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor'));
$data['lang_select_vendor_statustext'] =
lang('Select the vendor by klicking this link');
$data['lang_vendor']
= lang('Vendor');
- $data['property_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0');
- $data['lang_select_property_statustext']=
lang('Select the property by klicking this link');
+ $data['property_link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index', 'lookup'=> 1, 'type_id'=> 1,
'lookup_name'=> 0));
+ $data['lang_select_property_statustext']
= lang('Select the property by klicking this link');
$data['lang_property_statustext']
= lang('Search by property');
$data['lang_property']
= lang('property');
$data['loc1']
= $loc1;
@@ -438,7 +436,7 @@
$data['img_check']
=
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png';
$data['check_source']
= './'.$this->currentapp.'/inc/check.js';
$data['lang_save']
= lang('save');
- $data['done_action']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index');
+ $data['done_action']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.index'));
$data['lang_done_statustext']
= lang('Back to the list');
$data['lang_save_statustext']
= lang('Save the voucher');
$data['lang_select_all']
= lang('Select All');
@@ -500,10 +498,10 @@
$content[$i]['lang_tax_code_statustext'] = lang('select the appropriate
tax code');
$content[$i]['tax_code_list']
= $this->bo->tax_code_list($content[$i]['tax_code']);
$content[$i]['lang_remark']
= lang('Remark');
- $content[$i]['link_remark']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.remark');
+ $content[$i]['link_remark']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.remark'));
$content[$i]['lang_remark_help']
= lang('Klick this link to view the remark');
- $content[$i]['link_order']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.view_order');
- $content[$i]['link_claim']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant_claim.check');
+ $content[$i]['link_order']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.view_order'));
+ $content[$i]['link_claim']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitenant_claim.check'));
$i++;
}
}
@@ -530,8 +528,8 @@
'var' => 'spbudact_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.list_sub',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'cat_id' => $this->cat_id,
+
'sub' => $this->sub,
'paid'
=> $paid,
'voucher_id'
=> $voucher_id,
'query'
=> $this->query)
@@ -544,8 +542,8 @@
'var' => 'belop',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.list_sub',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'cat_id' => $this->cat_id,
+
'sub' => $this->sub,
'paid'
=> $paid,
'voucher_id'
=> $voucher_id,
'query'
=> $this->query)
@@ -562,8 +560,8 @@
'var' => 'dima',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiinvoice.list_sub',
-
'cat_id'
=>$this->cat_id,
-
'sub'
=>$this->sub,
+
'cat_id' =>
$this->cat_id,
+
'sub' => $this->sub,
'paid'
=> $paid,
'voucher_id'
=> $voucher_id,
'query'
=> $this->query)
@@ -619,7 +617,7 @@
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('Done'),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&user_lid='.$this->user_lid
. '&query='.$this->query),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.index', 'user_lid'=> $this->user_lid, 'query'=>
$this->query)),
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the voucher'),
'links'
=> $links,
@@ -777,7 +775,16 @@
$p_start_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,$content[$i]['period'],1,$p_year),$dateformat);
$p_end_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,($content[$i]['period']+1),0,$p_year),$dateformat);
$sum =
$sum+$content[$i]['consume'];
- $content[$i]['link_voucher'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index&paid=true&user_lid=all&district_id='.$district_id
. '&b_account_class=' . $b_account_class . '&start_date=' . $p_start_date .
'&end_date=' . $p_end_date);
+ $content[$i]['link_voucher'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction' =>
$this->currentapp.'.uiinvoice.index',
+
'paid' => true,
+
'user_lid' => 'all',
+
'district_id' => $district_id,
+
'b_account_class'=> $b_account_class,
+
'start_date' => $p_start_date,
+
'end_date' => $p_end_date
+
)
+
);
$content[$i]['consume'] =
number_format($content[$i]['consume'], 0, ',', ' ');
$i++;
}
@@ -861,14 +868,14 @@
$data['lang_workorder_statustext'] =
lang('enter the Workorder ID to search by workorder - at any date');
$data['workorder_id'] =
$workorder_id;
- $data['addressbook_link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor');
+ $data['addressbook_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor'));
$data['lang_select_vendor_statustext'] =
lang('Select the vendor by klicking this link');
$data['lang_vendor'] =
lang('Vendor');
$bolocation =
CreateObject($this->currentapp.'.bolocation');
$location_data =
$bolocation->initiate_ui_location(array('type_id'=> 1));
- $data['property_link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0');
+ $data['property_link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index', 'lookup'=> 1, 'type_id'=> 1,
'lookup_name'=> 0));
$data['lang_select_property_statustext'] =
lang('Select the property by klicking this link');
$data['lang_property_statustext'] =
lang('Search by property');
@@ -895,7 +902,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));
}
$voucher_id = get_var('voucher_id',array('POST','GET'));
@@ -917,7 +924,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.delete&voucher_id='
. $voucher_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.delete', 'voucher_id'=> $voucher_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -937,14 +944,14 @@
{
if(!$this->acl_add)
{
-
$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));
}
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','add_receipt');
if($receipt['voucher_id'])
{
- $link_receipt =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.receipt&voucher_id='
. $receipt['voucher_id']);
+ $link_receipt =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.receipt', 'voucher_id'=> $receipt['voucher_id']));
}
$GLOBALS['phpgw']->session->appsession('session_data','add_receipt','');
@@ -1115,7 +1122,7 @@
}
unset($values);
$GLOBALS['phpgw']->session->appsession('session_data','add_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.add');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.add'));
}
else
@@ -1175,10 +1182,10 @@
'calendar_setup_payment'
=> "Calendar.setup({inputField : 'payment_date',ifFormat : '" . $jsDateFormat
. "',button : 'payment_date-trigger'});",
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'cancel_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiinvoice.index'),
+ 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiinvoice.index')),
'lang_cancel'
=> lang('Cancel'),
'lang_cancel_statustext'
=> lang('cancel'),
- 'action_url'
=> $GLOBALS['phpgw']->link('/index.php','menuaction='. $this->currentapp
.'.uiinvoice.add'),
+ 'action_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> $this->currentapp
.'.uiinvoice.add')),
'tsvfilename'
=> '',
'lang_add'
=> lang('add'),
@@ -1195,7 +1202,7 @@
'lang_kid_nr_statustext'
=> lang('Enter Kid nr'),
'lang_vendor'
=> lang('Vendor'),
- 'addressbook_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor'),
+ 'addressbook_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor')),
'lang_invoice_date_statustext'
=> lang('Enter the invoice date'),
'lang_num_days_statustext'
=> lang('Enter the payment date or the payment delay'),
@@ -1286,7 +1293,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_info']['flags'][noheader] = True;
@@ -1625,10 +1632,10 @@
switch($order_type)
{
case 'workorder':
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiwo_hour.view&no_email=true&show_cost=true&workorder_id='
. $order_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiwo_hour.view', 'no_email'=> true, 'show_cost'=> true,
'workorder_id'=> $order_id));
break;
case 's_agreement':
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.view&id='
. $order_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.view', 'id'=> $order_id));
break;
}
}
Index: class.uipricebook.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.uipricebook.inc.php 17 Jun 2006 08:45:56 -0000 1.17
+++ class.uipricebook.inc.php 13 Sep 2006 12:56:22 -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 agreement
- * @version $Id: class.uipricebook.inc.php,v 1.17 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uipricebook.inc.php,v 1.18 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -89,10 +89,8 @@
$this->bo->save_sessiondata($data);
}
-
function excel()
{
-
$list = $this->bo->read();
$name =
array('num','branch','vendor_id','m_cost','w_cost','total_cost','this_index','unit','descr','index_count');
@@ -111,12 +109,11 @@
$this->bocommon->excel($list,$name,$descr);
}
-
function index()
{
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']->session->appsession('referer',$this->currentapp,'');
@@ -137,7 +134,6 @@
$receipt=$this->bo->update_pricebook($values);
}
-
$pricebook_list = $this->bo->read();
$i=0;
@@ -147,8 +143,8 @@
{
if($this->acl_manage)
{
- $link_edit
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id']);
- $link_prizing
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
. $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']
.'&cat_id=' .$this->cat_id);
+ $link_edit
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.edit_activity', 'activity_id'=>
$pricebook['activity_id']));
+ $link_prizing
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.prizing', 'activity_id'=>
$pricebook['activity_id'], 'vendor_id'=> $pricebook['vendor_id'], 'cat_id'=>
$this->cat_id));
$lang_edit_statustext
= lang('edit the pricebook');
$lang_prizing_statustext
= lang('view or edit prizing history of this element');
$text_edit
= lang('edit');
@@ -176,7 +172,6 @@
'text_edit'
=> $text_edit,
'text_prizing'
=> $text_prizing
);
-
$i++;
}
}
@@ -241,11 +236,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.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
);
if(!$this->allrows)
@@ -262,13 +257,13 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.excel',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'allrows'
=>$this->allrows,
- 'start' =>$this->start
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'allrows' => $this->allrows,
+ 'start' => $this->start
);
$data = array
@@ -304,7 +299,7 @@
'table_header'
=> $table_header,
'values'
=> $content,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.index')
);
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.index')) );
$appname
= lang('pricebook');
$function_msg =
lang('list pricebook per vendor');
@@ -319,7 +314,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']->session->appsession('referer',$this->currentapp,'');
@@ -341,8 +336,8 @@
'num'
=> $agreement['num'],
'status'
=> lang($agreement['status']),
'descr'
=> $agreement['descr'],
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement_group&agreement_group_id='
. $agreement['agreement_group_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=agreement_group&agreement_group_id='
. $agreement['agreement_group_id'] .'&start=' . $this->start),
+ 'link_edit' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.edit_agreement_group', 'agreement_group_id'=>
$agreement['agreement_group_id'])),
+ 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=>'agreement_group',
'agreement_group_id'=> $agreement['agreement_group_id'],
'start'=>$this->start)),
'lang_edit_statustext' =>
lang('edit the agreement_group'),
'lang_delete_statustext' =>
lang('Delete this agreement group'),
'text_edit'
=> lang('edit'),
@@ -371,18 +366,18 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.agreement_group',
- '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 an
activity'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_agreement_group')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.edit_agreement_group'))
);
if(!$this->allrows)
@@ -422,7 +417,7 @@
'table_header_agreement_group' =>
$table_header,
'values_agreement_group'
=> $content,
'table_add'
=> $table_add,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.agreement_group')
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.agreement_group'))
);
$appname
= lang('pricebook');
@@ -438,7 +433,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));
}
$agreement_group_id =
get_var('agreement_group_id',array('POST','GET'));
@@ -536,7 +531,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.'.uipricebook.agreement_group'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.agreement_group')),
'lang_agreement_group_id' =>
lang('Agreement group ID'),
'lang_num'
=> lang('Agreement group code'),
'lang_status'
=> lang('Status'),
@@ -568,7 +563,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('pricebook',
@@ -641,7 +636,7 @@
if($pricebook['current_index'])
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=prize&activity_id='
. $activity_id .'&vendor_id=' . $vendor_id .'&index_count=' .
$pricebook['index_count']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=>'prize', 'activity_id'=>
$activity_id, 'vendor_id'=> $vendor_id, 'index_count'=>
$pricebook['index_count']));
$value_m_cost =
$pricebook['m_cost'];
$value_w_cost =
$pricebook['w_cost'];
$value_total_cost =
$pricebook['total_cost'];
@@ -711,8 +706,8 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.prizing',
- 'activity_id' =>$activity_id,
- 'vendor_id'
=>$vendor_id
+ 'activity_id' => $activity_id,
+ 'vendor_id' => $vendor_id
);
if(!$this->allrows)
@@ -774,7 +769,7 @@
'values_prizing'
=> $content,
'table_update'
=> $table_update,
'table_first_entry'
=> $table_first_entry,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
. $activity_id . '&vendor_id=' . $vendor_id)
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.prizing', 'activity_id'=> $activity_id,
'vendor_id'=> $vendor_id))
);
$appname
= lang('pricebook');
@@ -823,7 +818,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('pricebook',
@@ -847,9 +842,9 @@
'ns3420'
=> $pricebook['ns3420'],
'unit'
=> $pricebook['unit'],
'descr'
=> $pricebook['descr'],
- 'link_vendor'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity_vendor&activity_id='
. $pricebook['activity_id'].'&agreement_group=' . $this->cat_id),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&activity_id='
. $pricebook['activity_id'].'&agreement_group=' . $this->cat_id),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=activity&activity_id='
. $pricebook['activity_id']),
+ 'link_vendor'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.activity_vendor', 'activity_id'=>
$pricebook['activity_id'], 'agreement_group'=> $this->cat_id)),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.edit_activity', 'activity_id'=>
$pricebook['activity_id'], 'agreement_group'=> $this->cat_id)),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=> 'activity', 'activity_id'=>
$pricebook['activity_id'])),
'lang_vendor_statustext' =>
lang('view the vendor(s) for this activity'),
'lang_edit_statustext' =>
lang('edit this activity'),
'lang_delete_statustext' =>
lang('delete this activity'),
@@ -886,17 +881,17 @@
(
'lang_add' =>
lang('add'),
'lang_add_statustext' => lang('add an
activity'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.edit_activity&agreement_group='
. $this->cat_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.edit_activity', 'agreement_group'=>
$this->cat_id))
);
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.activity',
- '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
);
if(!$this->allrows)
@@ -911,13 +906,13 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uipricebook.excel_2',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'allrows'
=>$this->allrows,
- 'start' =>$this->start
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'allrows' => $this->allrows,
+ 'start' => $this->start
);
$data = array
@@ -964,7 +959,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']->session->appsession('referer',$this->currentapp,'');
@@ -1002,8 +997,8 @@
'num'
=> $pricebook['num'],
'branch'
=> $pricebook['branch'],
'vendor_name'
=> $pricebook['vendor_name'],
- 'link_prizing'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.prizing&activity_id='
. $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method=activity_vendor&activity_id='
. $pricebook['activity_id'].'&vendor_id=' . $pricebook['vendor_id']),
+ 'link_prizing'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.prizing', 'activity_id'=>
$pricebook['activity_id'], 'vendor_id'=> $pricebook['vendor_id'])),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete',
'method'=>'activity_vendor','activity_id'=> $pricebook['activity_id'],
'&vendor_id'=> $pricebook['vendor_id'])),
'lang_prizing_statustext' =>
lang('view edit the prize for this activity'),
'lang_delete_statustext' =>
lang('delete this vendor from this activity'),
'text_prizing'
=> lang('Prizing'),
@@ -1083,7 +1078,7 @@
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Add this vendor to this activity'),
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.activity&cat_id='
. $values['cat_id']),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.activity', 'cat_id'=> $values['cat_id'])),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
@@ -1102,13 +1097,13 @@
{
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));
}
$activity_id =
get_var('activity_id',array('POST','GET'));
$agreement_group =
get_var('agreement_group',array('GET'));
$values =
get_var('values',array('POST','GET'));
- $values['ns3420_id']=
get_var('ns3420_id',array('POST','GET'));
+ $values['ns3420_id'] =
get_var('ns3420_id',array('POST','GET'));
if(!$values['cat_id'])
{
@@ -1203,7 +1198,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.'.uipricebook.activity&cat_id='
. $values['cat_id']),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.activity', 'cat_id'=> $values['cat_id'])),
'lang_activity_id'
=> lang('Activity ID'),
'lang_num'
=> lang('Activity code'),
'lang_category'
=> lang('Agreement group'),
@@ -1246,7 +1241,7 @@
'lang_no_branch'
=> lang('Select branch'),
'lang_branch_statustext' =>
lang('Select the branch 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'),
@@ -1263,7 +1258,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));
}
$method =
get_var('method',array('GET'));
@@ -1282,7 +1277,7 @@
);
$function_msg =lang('delete vendor activity');
- $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&activity_id=' . $activity_id . '&vendor_id=' . $vendor_id);
+ $delete_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=> $method, 'activity_id'=>
$activity_id, 'vendor_id'=> $vendor_id));
if (get_var('confirm',array('POST')))
{
@@ -1298,7 +1293,7 @@
);
$function_msg =lang('delete activity');
- $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&activity_id=' . $activity_id);
+ $delete_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=> $method, 'activity_id'=>
$activity_id));
if (get_var('confirm',array('POST')))
{
@@ -1316,7 +1311,7 @@
);
$function_msg =lang('delete prize-index');
- $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&activity_id=' . $activity_id . '&vendor_id=' . $vendor_id .
'&index_count=' . $index_count);
+ $delete_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=> $method, 'activity_id'=>
$activity_id, 'vendor_id'=> $vendor_id, 'index_count'=> $index_count));
if (get_var('confirm',array('POST')))
{
@@ -1333,7 +1328,7 @@
);
$function_msg =lang('Delete agreement group
and all the activities associated with it!');
- $delete_action =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uipricebook.delete&method='
. $method . '&agreement_group_id=' . $agreement_group_id . '&start=' .
$this->start);
+ $delete_action =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uipricebook.delete', 'method'=> $method,
'agreement_group_id'=> $agreement_group_id, 'start'=> $this->start));
if (get_var('confirm',array('POST')))
{
@@ -1361,6 +1356,5 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('delete' => $data));
// $GLOBALS['phpgw']->xslttpl->pp();
}
-
}
?>
Index: class.uir_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uir_agreement.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- class.uir_agreement.inc.php 17 Jun 2006 08:45:56 -0000 1.16
+++ class.uir_agreement.inc.php 13 Sep 2006 12:56:22 -0000 1.17
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uir_agreement.inc.php,v 1.16 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uir_agreement.inc.php,v 1.17 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -32,7 +32,7 @@
'view' => True,
'edit' => True,
'delete' => True,
- 'list_attribute'=> True,
+ 'list_attribute' => True,
'edit_attrib' => True,
'columns' => True,
'edit_item' => True,
@@ -151,7 +151,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_info']['flags'][noheader] = True;
@@ -192,7 +192,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('r_agreement',
@@ -230,19 +230,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.view&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.view', 'id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_edit)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
r_agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_delete)
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
r_agreement');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete&r_agreement_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete', 'r_agreement_id'=> $entry['id'],
'role'=> $this->role));
}
$j++;
@@ -266,8 +266,8 @@
'var' =>
$uicols['name'][$i],
'order' =>
$this->order,
'extra'
=> array('menuaction' => $this->currentapp.'.uir_agreement.index',
-
'query' =>$this->query,
-
'lookup' =>$lookup,
+
'query' => $this->query,
+
'lookup' => $lookup,
'district_id' => $this->district_id,
'start_date' => $start_date,
'role' => $this->role,
@@ -309,7 +309,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
rental agreement'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&role='
. $this->role)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'role'=> $this->role))
);
}
@@ -389,11 +389,11 @@
'values'
=> $content,
'table_add'
=> $table_add,
- '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_select_tenant_statustext' => lang('Select
the customer by klicking this link'),
'lang_tenant'
=> lang('customer'),
- 'property_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&lookup=1&type_id=1&lookup_name=0'),
- 'lang_select_property_statustext'=>
lang('Select the property by klicking this link'),
+ 'property_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index', 'lookup'=>1, 'type_id'=>1,
'lookup_name'=>0)),
+ 'lang_select_property_statustext'
=> lang('Select the property by klicking this link'),
'lang_property_statustext' =>
lang('Search by property'),
'lang_property'
=> lang('property'),
'customer_id'
=> $this->customer_id,
@@ -439,19 +439,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.view_item&r_agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.view_item', 'r_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_edit && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
r_agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_item', 'r_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_delete && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('delete this
item');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&delete_item=1&id='
. $entry['agreement_id'] .'&item_id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'delete_item'=>1, 'id'=>
$entry['agreement_id'], 'item_id'=> $entry['id']));
}
$j++;
@@ -618,7 +618,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','r_agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.index', 'role'=> $this->role));
}
}
}
@@ -672,7 +672,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.index', 'role'=> $this->role));
}
endif;
}
@@ -706,7 +706,6 @@
'date_img'
=> $cal_info['img'],
'lang_datetitle'
=> lang('Select date'),
'calendar_setup'
=> "Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat
. "',button : 'date-trigger'});",
-
'lang_new_index'
=> lang('New index'),
'lang_new_index_statustext'
=> lang('Enter a new index'),
'lang_date_statustext'
=> lang('Select the date for the update'),
@@ -725,12 +724,12 @@
if($this->acl_edit)
{
- $link_edit =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_common&r_agreement_id='
. $common_entry['agreement_id'] . '&c_id=' . $common_entry['c_id']);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_common', 'r_agreement_id'=>
$common_entry['agreement_id'], 'c_id'=> $common_entry['c_id']));
$text_edit
= lang('edit');
}
if($this->acl_delete)
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete_common&r_agreement_id='
. $common_entry['agreement_id'] . '&c_id=' . $common_entry['c_id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete_common', 'r_agreement_id'=>
$common_entry['agreement_id'], 'c_id'=> $common_entry['c_id']));
$text_delete
=lang('delete');
}
@@ -746,7 +745,7 @@
'fraction'
=> $common_entry['fraction'],
'override_fraction'
=> $common_entry['override_fraction'],
'remark'
=> $common_entry['remark'],
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.view&agreement_id='
. $common_entry['agreement_id'] . '&c_id=' . $common_entry['c_id']),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.view', 'agreement_id'=>
$common_entry['agreement_id'], 'c_id'=> $common_entry['c_id'])),
'link_edit'
=> $link_edit,
'link_delete'
=> $link_delete,
'lang_view_statustext'
=> lang('view the part of town'),
@@ -854,21 +853,21 @@
(
'lang_add' =>
lang('add space'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_item', 'r_agreement_id'=> $id))
);
$table_add_service[] = array
(
'lang_add' =>
lang('add service'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 'r_agreement_id'=> $id))
);
$table_add_common[] = array
(
'lang_add' =>
lang('add common'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_common&r_agreement_id='
. $id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_common', 'r_agreement_id'=> $id))
);
@@ -982,7 +981,7 @@
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $id),
+ 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -1092,7 +1091,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','r_agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $r_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $r_agreement_id));
}
}
else
@@ -1132,7 +1131,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $r_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $r_agreement_id));
}
endif;
}
@@ -1190,7 +1189,7 @@
(
'lang_add' =>
lang('add detail'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $r_agreement_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_item','r_agreement_id'=>
$r_agreement_id))
);
@@ -1301,7 +1300,7 @@
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
'table_update_item'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&r_agreement_id='
. $r_agreement_id . '&id=' . $id),
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_item', 'r_agreement_id'=>
$r_agreement_id, 'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -1313,7 +1312,7 @@
'set_column'
=> $set_column,
'lang_delete_last'
=> lang('delete last index'),
'lang_delete_last_statustext' => lang('delete
the last index'),
- 'delete_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_item&delete_last=1&r_agreement_id='
. $r_agreement_id . '&id=' . $id),
+ 'delete_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_item', 'delete_last'=>1,
'r_agreement_id'=> $r_agreement_id, 'id'=> $id)),
'tenant_data'
=> $tenant_data,
'rental_type_list'
=> $this->bo->get_rental_type_list($values['rental_type_id']),
'lang_rental_type_statustext' => lang('Select
rental type'),
@@ -1465,7 +1464,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete&r_agreement_id='
. $r_agreement_id. '&id=' . $id . '&attrib=' . $attrib . '&role=' .
$this->role),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete', 'r_agreement_id'=> $r_agreement_id,
'id'=> $id, 'attrib'=> $attrib, 'role'=> $this->role)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1659,10 +1658,10 @@
'input_text'
=> $attrib['input_text'],
'sorting'
=> $attrib['attrib_sort'],
'search'
=> $attrib['search'],
- 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.list_attribute&resort=up&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.list_attribute&resort=down&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_attrib&id='
. $attrib['id'] . '&role=' . $this->role),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete&id='
. $attrib['id'].'&attrib=true&role=' . $this->role),
+ 'link_up'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.list_attribute', 'resort'=>'up', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_down'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.list_attribute', 'resort'=>'down', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_attrib', 'id'=> $attrib['id'], 'role'=>
$this->role)),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete', 'id'=> $attrib['id'],
'attrib'=>true, 'role'=> $this->role)),
'lang_view_attribtext' =>
lang('view the attrib'),
'lang_attribute_attribtext' =>
lang('attributes for the attrib'). ' ' . lang('location'),
'lang_edit_attribtext' =>
lang('edit the attrib'),
@@ -1711,7 +1710,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_attribtext' => lang('add an
attrib'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_attrib&role='
. $this->role),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_attrib', 'role'=> $this->role)),
'lang_done' =>
lang('done'),
'lang_done_attribtext' => lang('back to
admin'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
@@ -1830,7 +1829,6 @@
{
$receipt['error'][] = array('msg'
=> lang('Attribute has NOT been saved'));
}
-
}
if ($id)
@@ -1883,7 +1881,7 @@
'lang_delete_choice_statustext' =>
lang('Delete this value from the list of multiple choice'),
'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.'.uir_agreement.list_attribute&type_id='.$type_id
. '&role=' . $this->role),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.list_attribute', 'type_id'=> $type_id,
'role'=> $this->role)),
'lang_id' =>
lang('Attribute ID'),
'lang_save' =>
lang('save'),
'lang_done' =>
lang('done'),
@@ -1980,7 +1978,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','r_agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $r_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $r_agreement_id));
}
}
}
@@ -2005,7 +2003,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit&id='
. $r_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit', 'id'=> $r_agreement_id));
}
endif;
}
@@ -2028,12 +2026,12 @@
if($this->acl_edit)
{
- $link_edit =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.edit_common_h&r_agreement_id='
. $r_agreement_id . '&c_id=' . $common_entry['c_id'] . '&id=' .
$common_entry['id']);
+ $link_edit =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.edit_common_h', 'r_agreement_id'=>
$r_agreement_id, 'c_id'=> $common_entry['c_id'], 'id'=> $common_entry['id']));
$text_edit
= lang('edit');
}
if($this->acl_delete)
{
- $link_delete =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete_common_h&r_agreement_id='
. $r_agreement_id . '&c_id=' . $common_entry['c_id'] . '&id=' .
$common_entry['id']);
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete_common_h', 'r_agreement_id'=>
$r_agreement_id, 'c_id'=> $common_entry['c_id'], 'id'=> $common_entry['id']));
$text_delete
=lang('delete');
}
@@ -2048,7 +2046,7 @@
'fraction'
=> $common_entry['fraction'],
'override_fraction'
=> $common_entry['override_fraction'],
'remark'
=> $common_entry['remark'],
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.view_common_h&agreement_id='
. $r_agreement_id . '&c_id=' . $common_entry['c_id'] . '&id=' .
$common_entry['id']),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.view_common_h', 'agreement_id'=>
$r_agreement_id, 'c_id'=> $common_entry['c_id'], 'id'=> $common_entry['id'])),
'link_edit'
=> $link_edit,
'link_delete'
=> $link_delete,
'lang_view_statustext'
=> lang('view the part of town'),
@@ -2177,7 +2175,7 @@
'b_account_data'
=> $b_account_data,
'lang_remark'
=> lang('Remark'),
'lang_override_fraction' =>
lang('Override fraction'),
- 'lang_override_fraction_statustext'=>
lang('Override fraction of common costs'),
+ 'lang_override_fraction_statustext'
=> lang('Override fraction of common costs'),
'value_override_fraction' =>
$values['override_fraction'],
'value_remark' => $values['remark'],
'values_common_history'
=> $content_common,
@@ -2187,10 +2185,6 @@
'lang_start_date'
=> lang('start date'),
'value_start_date'
=> $default_next_date,
'lang_end_date' =>
lang('end date'),
-
-
-
-
);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('rental agreement') . ': ' . ($values['c_id']?lang('edit common cost') . '
' . $r_agreement['name']:lang('add common cost') . ' ' . $r_agreement['name']);
@@ -2227,7 +2221,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uir_agreement.delete_common_h&r_agreement_id='
. $r_agreement_id. '&c_id=' . $c_id . '&id=' . $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uir_agreement.delete_common_h', 'r_agreement_id'=>
$r_agreement_id, 'c_id'=> $c_id, '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'),
Index: class.uis_agreement.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uis_agreement.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.uis_agreement.inc.php 17 Jun 2006 08:45:56 -0000 1.29
+++ class.uis_agreement.inc.php 13 Sep 2006 12:56:22 -0000 1.30
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage agreement
- * @version $Id: class.uis_agreement.inc.php,v 1.29 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uis_agreement.inc.php,v 1.30 2006/09/13 12:56:22
sigurdne Exp $
*/
/**
@@ -32,7 +32,7 @@
'view' => True,
'edit' => True,
'delete' => True,
- 'list_attribute'=> True,
+ 'list_attribute' => True,
'edit_attrib' => True,
'columns' => True,
'edit_item' => True,
@@ -147,7 +147,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_info']['flags'][noheader] = True;
@@ -188,7 +188,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('s_agreement',
@@ -226,19 +226,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.view&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.view','id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_edit)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
s_agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit','id'=> $entry['id'], 'role'=>
$this->role));
}
if($this->acl_delete)
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
s_agreement');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.delete&s_agreement_id='
. $entry['id'] .'&role=' . $this->role);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.delete', 's_agreement_id'=> $entry['id'],
'role'=> $this->role));
}
$j++;
@@ -262,8 +262,8 @@
'var' =>
$uicols['name'][$i],
'order' =>
$this->order,
'extra'
=> array('menuaction' => $this->currentapp.'.uis_agreement.index',
-
'query' =>$this->query,
-
'lookup' =>$lookup,
+
'query' => $this->query,
+
'lookup' => $lookup,
'district_id' => $this->district_id,
'start_date' => $start_date,
'role' => $this->role,
@@ -305,7 +305,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
service agreement'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&role='
. $this->role)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit', 'role'=> $this->role))
);
}
@@ -415,19 +415,19 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
entity');
$content[$j]['row'][$i]['text']
= lang('view');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.view_item&s_agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.view_item', 's_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_edit && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
s_agreement');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_item&s_agreement_id='
. $entry['agreement_id'] .'&id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 's_agreement_id'=>
$entry['agreement_id'], 'id'=> $entry['id']));
}
if($this->acl_delete && !$edit_item &&
!$view_only)
{
$content[$j]['row'][$i]['statustext'] = lang('delete this
item');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&delete_item=1&id='
. $entry['agreement_id'] .'&item_id=' . $entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit', 'delete_item'=>1, 'id'=>
$entry['agreement_id'], 'item_id'=> $entry['id']));
}
$j++;
@@ -588,7 +588,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','s_agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.index', 'role'=> $this->role));
}
}
}
@@ -642,7 +642,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.index&role='
. $this->role);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.index', 'role'=> $this->role));
}
endif;
}
@@ -706,7 +706,7 @@
$alarm_data=$this->bocommon->initiate_ui_alarm(array(
'acl_location'=>$this->acl2_location,
- 'alarm_type'=> 's_agreement',
+ 'alarm_type' =>
's_agreement',
'type' => 'form',
'text' => 'Email
notification',
'times' => $times,
@@ -755,7 +755,7 @@
(
'lang_add' =>
lang('add detail'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_item&s_agreement_id='
. $id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 's_agreement_id'=> $id))
);
@@ -777,7 +777,7 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uis_agreement.excel',
- 'id'
=>$id
+ 'id' => $id
);
@@ -867,7 +867,7 @@
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
. $id),
+ 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit', 'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -965,7 +965,7 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','s_agreement_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
. $s_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit', 'id'=> $s_agreement_id));
}
}
else
@@ -1005,7 +1005,7 @@
}
elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit&id='
. $s_agreement_id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit', 'id'=> $s_agreement_id));
}
endif;
}
@@ -1062,7 +1062,7 @@
(
'lang_add' =>
lang('add detail'),
'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_item&s_agreement_id='
. $s_agreement_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 's_agreement_id'=>
$s_agreement_id))
);
@@ -1151,7 +1151,7 @@
'table_header'
=> $table_header,
'acl_manage'
=> $this->acl_manage,
'table_update'
=> $table_update,
- 'update_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_item&s_agreement_id='
. $s_agreement_id . '&id=' . $id),
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 's_agreement_id'=>
$s_agreement_id, 'id'=> $id)),
'lang_select_all'
=> lang('Select All'),
'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path($this->currentapp).'/check.png',
'check_source'
=> './'.$this->currentapp.'/inc/check.js',
@@ -1163,7 +1163,7 @@
'set_column'
=> $set_column,
'lang_delete_last'
=> lang('delete last index'),
'lang_delete_last_statustext' => lang('delete
the last index'),
- 'delete_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_item&delete_last=1&s_agreement_id='
. $s_agreement_id . '&id=' . $id),
+ 'delete_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_item', 'delete_last'=>1,
's_agreement_id'=> $s_agreement_id, 'id'=> $id)),
);
@@ -1238,7 +1238,6 @@
'lang_agreement'
=> lang('Agreement'),
'agreement_name'
=> $s_agreement['name'],
-
'table_add'
=> $table_add,
'values'
=> $content,
'table_header'
=> $table_header,
@@ -1292,7 +1291,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.delete&s_agreement_id='
. $s_agreement_id. '&id=' . $id . '&attrib=' . $attrib . '&role=' .
$this->role),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.delete', 's_agreement_id'=> $s_agreement_id,
'id'=> $id, 'attrib'=> $attrib, 'role'=> $this->role)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1352,15 +1351,15 @@
$alarm_data=$this->bocommon->initiate_ui_alarm(array(
-
'acl_location'=>$this->acl2_location,
- 'alarm_type'=> 's_agreement',
+ 'acl_location'
=>$this->acl2_location,
+ 'alarm_type' =>
's_agreement',
'type' => 'view',
'text' => 'Email
notification',
'times' => $times,
'id' =>
$s_agreement_id,
'method' => $method,
'data' => $data,
- 'account_id'=> $account_id
+ 'account_id' => $account_id
));
@@ -1479,10 +1478,10 @@
'input_text'
=> $attrib['input_text'],
'sorting'
=> $attrib['attrib_sort'],
'search'
=> $attrib['search'],
- 'link_up'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.list_attribute&resort=up&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_down'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.list_attribute&resort=down&id='
. $attrib['id'] . '&allrows=' . $this->allrows . '&role=' . $this->role),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_attrib&id='
. $attrib['id'] . '&role=' . $this->role),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.delete&id='
. $attrib['id'].'&attrib=true&role=' . $this->role),
+ 'link_up'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.list_attribute', 'resort'=>'up', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_down'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.list_attribute', 'resort'=>'down', 'id'=>
$attrib['id'], 'allrows'=> $this->allrows, 'role'=> $this->role)),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_attrib', 'id'=> $attrib['id'], 'role'=>
$this->role)),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.delete', 'id'=> $attrib['id'],
'attrib'=>true, 'role'=> $this->role)),
'lang_view_attribtext' =>
lang('view the attrib'),
'lang_attribute_attribtext' =>
lang('attributes for the attrib'). ' ' . lang('location'),
'lang_edit_attribtext' =>
lang('edit the attrib'),
@@ -1531,7 +1530,7 @@
(
'lang_add' =>
lang('add'),
'lang_add_attribtext' => lang('add an
attrib'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uis_agreement.edit_attrib&role='
. $this->role),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.edit_attrib', 'role'=> $this->role)),
'lang_done' =>
lang('done'),
'lang_done_attribtext' => lang('back to
admin'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
@@ -1703,7 +1702,7 @@
'lang_delete_choice_statustext' =>
lang('Delete this value from the list of multiple choice'),
'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.'.uis_agreement.list_attribute&type_id='.$type_id
. '&role=' . $this->role),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uis_agreement.list_attribute', 'type_id'=> $type_id,
'role'=> $this->role)),
'lang_id' =>
lang('Attribute ID'),
'lang_save' =>
lang('save'),
'lang_done' =>
lang('done'),
@@ -1721,7 +1720,7 @@
'lang_entity_statustext' => lang('Select
a service agreement type'),
'lang_statustext' =>
lang('Statustext'),
- 'lang_statustext_attribtext'=> lang('Enter a
statustext for the inputfield in forms'),
+ 'lang_statustext_attribtext' =>
lang('Enter a statustext for the inputfield in forms'),
'value_statustext' =>
$values['statustext'],
'lang_done_attribtext' => lang('Back
to the list'),
@@ -1755,9 +1754,7 @@
'value_search' =>
$values['search'],
'lang_include_search' =>
lang('Include in search'),
- 'lang_include_search_statustext'=> lang('check
to show this attribute in location list'),
-
-
+ 'lang_include_search_statustext' =>
lang('check to show this attribute in location list'),
);
//html_print_r($data);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bocommon.inc.php class.sobud...,
Sigurd Nes <=