[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiga...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiga... |
|
Date: |
Tue, 12 Sep 2006 08:54:08 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/12 08:54:08
Modified files:
inc : class.uiproject.inc.php class.uigab.inc.php
class.uitts.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uigab.inc.php?cvsroot=phpgroupware&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uitts.inc.php?cvsroot=phpgroupware&r1=1.35&r2=1.36
Patches:
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.uiproject.inc.php 9 Jul 2006 19:32:12 -0000 1.31
+++ class.uiproject.inc.php 12 Sep 2006 08:54:08 -0000 1.32
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.31 2006/07/09 19:32:12
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.32 2006/09/12 08:54:08
sigurdne Exp $
*/
/**
@@ -99,7 +99,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('project','values','table_header',
@@ -135,7 +135,7 @@
$content[$j]['row'][]= array(
'statustext' => lang('search'),
'text'
=> $project_entry[$uicols['name'][$k]],
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' . $lookup
. '&from=' . $from . '&filter=' . $this->filter)
+ 'link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index', 'query'=>
$project_entry['query_location'][$uicols['name'][$k]], 'lookup'=> $lookup,
'from'=> $from, 'filter'=> $this->filter))
);
}
else
@@ -151,14 +151,14 @@
$content[$j]['row'][]= array(
'statustext'
=> lang('search'),
'text'
=> $project_entry[$uicols['name'][$k]],
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitts.view&id='
. $project_entry[$uicols['name'][$k]])
+ 'link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uitts.view', 'id'=> $project_entry[$uicols['name'][$k]]))
);
}
if($lookup &&
$k==($count_uicols_name-1))
{
$content[$j]['row'][]=
array(
- 'lookup_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.ui' .
$from . '.edit&project_id=' . $project_entry['project_id'])
+ 'lookup_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.ui' . $from . '.edit', 'project_id'=>
$project_entry['project_id']))
);
}
}
@@ -170,7 +170,7 @@
$content[$j]['row'][]=
array(
'statustext'
=> lang('view the project'),
'text'
=> lang('view'),
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id'])
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.view', 'id'=> $project_entry['project_id']))
);
}
else
@@ -183,7 +183,7 @@
$content[$j]['row'][]=
array(
'statustext' =>
lang('edit the project'),
'text'
=> lang('edit'),
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id'])
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit','id'=> $project_entry['project_id']))
);
}
else
@@ -196,7 +196,7 @@
$content[$j]['row'][]=
array(
'statustext' =>
lang('delete the project'),
'text'
=> lang('delete'),
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_entry['project_id'])
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.delete', 'project_id'=>
$project_entry['project_id']))
);
}
else
@@ -226,15 +226,15 @@
'var' => 'location_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
-
'lookup'
=>$lookup,
-
'from' =>$from,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
+
'lookup' =>
$lookup,
+
'from' =>
$from,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'start_date'=>$start_date,
-
'end_date'=>$end_date,
-
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
'cat_id' =>
$this->cat_id,
+
'start_date' =>
$start_date,
+
'end_date' =>
$end_date,
+
'wo_hour_cat_id'=>
$this->wo_hour_cat_id
)
));
}
@@ -247,15 +247,15 @@
'var' => 'project_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
-
'lookup'
=>$lookup,
-
'from' =>$from,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
+
'lookup' =>
$lookup,
+
'from' =>
$from,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'start_date'=>$start_date,
-
'end_date'=>$end_date,
-
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
'cat_id' =>
$this->cat_id,
+
'start_date' =>
$start_date,
+
'end_date' =>
$end_date,
+
'wo_hour_cat_id'=>
$this->wo_hour_cat_id
)
));
}
@@ -268,15 +268,15 @@
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uiproject.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
-
'lookup'
=>$lookup,
-
'from' =>$from,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
+
'lookup' =>
$lookup,
+
'from' =>
$from,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'start_date'=>$start_date,
-
'end_date'=>$end_date,
-
'wo_hour_cat_id'
=>$this->wo_hour_cat_id
+
'cat_id' =>
$this->cat_id,
+
'start_date' =>
$start_date,
+
'end_date' =>
$end_date,
+
'wo_hour_cat_id'=>
$this->wo_hour_cat_id
)
));
}
@@ -321,7 +321,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
project'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit'))
);
}
@@ -342,7 +342,7 @@
'wo_hour_cat_id'
=>$this->wo_hour_cat_id,
);
- $link_date_search
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.date_search');
+ $link_date_search =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.date_search'));
$link_excel = array
(
@@ -377,7 +377,7 @@
'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
'lang_select'
=> lang('select'),
- 'lookup_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
+ 'lookup_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit')),
'lookup'
=> $lookup,
'links'
=> $links,
'allow_allrows'
=> false,
@@ -491,7 +491,7 @@
{
if(!$this->acl_add && !$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=2&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=> 2, 'acl_location'=>
$this->acl2_location));
}
$id =
get_var('id',array('POST','GET'));
$values =
get_var('values',array('POST'));
@@ -668,7 +668,7 @@
$subject = lang(Approval).": ".
$values['project_id'];
// $message = lang(Project) . " "
. $values['project_id'] ." ". lang('needs approval');
- $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $values['project_id']).'">' . lang(Project) . " " . $values['project_id'] ."
". lang('needs approval') .'</a>';
+ $message = '<a href ="http://'
. $GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit','id'=> $values['project_id'])).'">' .
lang(Project) . " " . $values['project_id'] ." ". lang('needs approval')
.'</a>';
$mail_method=
$config->config_data['fmwrkorder_mail'];
if ($mail_method=='smtp'):
@@ -717,7 +717,7 @@
$from_name=$GLOBALS['phpgw_info']['user']['fullname'];
$from_email=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['email'];
- $body = '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $values['project_id']).'">' . lang('project %1 has been edited',$id) .'</a>'
. "\n";
+ $body = '<a href ="http://' .
$GLOBALS['phpgw_info']['server']['hostname'] .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit', 'id'=> $values['project_id'])).'">' .
lang('project %1 has been edited',$id) .'</a>' . "\n";
foreach($receipt['notice_owner'] as $notice)
{
$body .= $notice . "\n";
@@ -775,14 +775,14 @@
if(!$values['workorder_budget'] && $save)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit', 'project_id'=> $id));
}
if
(!$this->bocommon->check_perms($values['grants'],PHPGW_ACL_EDIT))
{
$receipt['error'][]=array('msg'=>lang('You have no edit right for this
project'));
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $id);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>$this->currentapp.'.uiproject.view',
'id'=> $id));
}
else
{
@@ -909,7 +909,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp
. $values['origin'][$i]['link']);
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -949,15 +949,15 @@
'lang_request_statustext'
=> lang('Link to the request for this project'),
'lang_delete_request_statustext'
=> lang('Check to delete this request from this project'),
'link_select_request'
=> $GLOBALS['phpgw']->link('/index.php',$link_request_data),
- 'link_request'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.view'),
+ 'link_request'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uirequest.view')),
- 'add_workorder_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
+ 'add_workorder_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit')),
'lang_add_workorder'
=> lang('Add workorder'),
'lang_add_workorder_statustext'
=> lang('Add a workorder to this project'),
'table_header_workorder_budget'
=> $table_header_workorder_budget,
'lang_no_workorders'
=> lang('No workorder budget'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit'),
+ 'workorder_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.edit')),
'record_history'
=> $record_history,
'table_header_history'
=> $table_header_history,
'lang_history'
=> lang('History'),
@@ -1005,7 +1005,7 @@
'location_data'
=> $location_data,
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index')),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
@@ -1094,7 +1094,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));
}
$project_id = get_var('project_id',array('POST','GET'));
@@ -1117,7 +1117,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&project_id='
. $project_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.delete', 'project_id'=> $project_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1137,7 +1137,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));
}
$receipt =
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp);
@@ -1209,7 +1209,7 @@
{
for ($i=0;$i<count($values['origin']);$i++)
{
-
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp
. $values['origin'][$i]['link']);
+
$values['origin'][$i]['link']=$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp . $values['origin'][$i]['link']));
if(substr($values['origin'][$i]['type'],0,6)=='entity')
{
$type =
explode("_",$values['origin'][$i]['type']);
@@ -1240,7 +1240,7 @@
'table_header_workorder_budget' =>
$table_header_workorder_budget,
'lang_no_workorders' =>
lang('No workorder budget'),
- 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'),
+ 'workorder_link' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiworkorder.view')),
'record_history'
=> $record_history,
'table_header_history' =>
$table_header_history,
'lang_history'
=> lang('History'),
@@ -1267,12 +1267,12 @@
'lang_reserve_remainder' =>
lang('reserve remainder'),
'value_reserve_remainder' =>
$reserve_remainder,
- 'value_reserve_remainder_percent'=>
$remainder_percent,
+ 'value_reserve_remainder_percent' =>
$remainder_percent,
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
'location_type'
=> 'view',
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.index')),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
@@ -1320,7 +1320,7 @@
'key_deliver_list'
=> $this->bo->select_key_location_list($values['key_deliver']),
'lang_key_deliver'
=> lang('key deliver location'),
- 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $id),
+ 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uiproject.edit', 'id'=> $id)),
'lang_edit_statustext'
=> lang('Edit this entry project'),
'lang_edit'
=> lang('Edit'),
'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
Index: class.uigab.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uigab.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- class.uigab.inc.php 12 Sep 2006 07:33:22 -0000 1.20
+++ class.uigab.inc.php 12 Sep 2006 08:54:08 -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 location
- * @version $Id: class.uigab.inc.php,v 1.20 2006/09/12 07:33:22 sigurdne
Exp $
+ * @version $Id: class.uigab.inc.php,v 1.21 2006/09/12 08:54:08 sigurdne
Exp $
*/
/**
@@ -98,7 +98,7 @@
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=>1, 'acl_location'=>
$this->acl2_location));
}
$gab_list =
$this->bo->read($location_code,$gaards_nr,$bruksnr,$feste_nr,$seksjons_nr,$address,$check_payments,$allrows=True);
@@ -161,7 +161,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('gab',
@@ -461,7 +461,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('gab','values','table_header',
@@ -689,7 +689,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));
}
$from =
get_var('from',array('POST','GET'));
@@ -866,7 +866,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));
}
$gab_id = get_var('gab_id',array('POST','GET'));
@@ -910,7 +910,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));
}
$gab_id =
get_var('gab_id',array('POST','GET'));
Index: class.uitts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uitts.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- class.uitts.inc.php 12 Sep 2006 07:56:47 -0000 1.35
+++ class.uitts.inc.php 12 Sep 2006 08:54:08 -0000 1.36
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage helpdesk
- * @version $Id: class.uitts.inc.php,v 1.35 2006/09/12 07:56:47 sigurdne
Exp $
+ * @version $Id: class.uitts.inc.php,v 1.36 2006/09/12 08:54:08 sigurdne
Exp $
*/
/**
@@ -168,7 +168,7 @@
{
if(!$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=4&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop','perm'=> 4, 'acl_location'=>
$this->acl2_location));
}
$new_status =
get_var('new_status',array('POST','GET'));
@@ -565,7 +565,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));
}
$bolocation =
CreateObject($this->currentapp.'.bolocation');
@@ -634,7 +634,7 @@
$receipt = $this->bo->add($values);
$GLOBALS['phpgw']->session->appsession('receipt',$this->currentapp,$receipt);
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts','');
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uitts.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uitts.index'));
}
else
{
@@ -785,7 +785,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));
}
$bolocation =
CreateObject($this->currentapp.'.bolocation');
@@ -799,7 +799,7 @@
{
if(!$this->acl_edit)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=4&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.stop', 'perm'=>4, 'acl_location'=>
$this->acl2_location));
}
$so2 =
CreateObject($this->currentapp.'.sotts2');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.uiproject.inc.php class.uiga...,
Sigurd Nes <=