|
| From: | Sigurd Nes |
| Subject: | [Phpgroupware-cvs] property/inc class.uilocation.inc.php |
| Date: | Mon, 11 Sep 2006 14:45:55 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/11 14:45:55
Modified files:
inc : class.uilocation.inc.php
Log message:
link()
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
Patches:
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.uilocation.inc.php 6 Sep 2006 07:18:36 -0000 1.29
+++ class.uilocation.inc.php 11 Sep 2006 14:45:55 -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 location
- * @version $Id: class.uilocation.inc.php,v 1.29 2006/09/06 07:18:36
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.30 2006/09/11 14:45:55
sigurdne Exp $
*/
/**
@@ -117,7 +117,12 @@
{
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('location',
@@ -162,7 +167,15 @@
{
$content[$j]['row'][$i]['statustext'] = lang('search');
$content[$j]['row'][$i]['text'] =
$location[$uicols['name'][$i]];
-
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&query='
. $location['query_location'][$uicols['name'][$i]] . '&lookup=' . $lookup .
'&type_id=' . $type_id . '&lookup_tenant=' . $lookup_tenant . '&lookup_name=' .
$lookup_name);
+
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction' => $this->currentapp.'.uilocation.index',
+
'query'
=> $location['query_location'][$uicols['name'][$i]],
+
'lookup' => $lookup,
+
'type_id' => $type_id,
+
'lookup_tenant' => $lookup_tenant,
+
'lookup_name' => $lookup_name
+
)
+
);
}
else
{
@@ -182,7 +195,12 @@
{
$content[$j]['row'][$i]['statustext'] = lang('view the
location');
$content[$j]['row'][$i]['text'] = lang('view');
-
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.view&location_code='
. $location['location_code'] . '&lookup_tenant=' . $lookup_tenant);
+
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>
$this->currentapp.'.uilocation.view',
+
'location_code'=> $location['location_code'],
+
'lookup_tenant'=>$lookup_tenant
+
)
+
);
$i++;
}
@@ -190,7 +208,12 @@
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
location');
$content[$j]['row'][$i]['text'] = lang('edit');
-
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.edit&location_code='
. $location['location_code'] . '&lookup_tenant=' . $lookup_tenant);
+
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>
$this->currentapp.'.uilocation.edit',
+
'location_code'=> $location['location_code'],
+
'lookup_tenant'=>$lookup_tenant
+
)
+
);
$i++;
}
@@ -198,7 +221,13 @@
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
location');
$content[$j]['row'][$i]['text'] =
lang('delete');
-
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.delete&location_code='
. $location['location_code'] . '&type_id=' . $type_id . '&lookup_tenant=' .
$lookup_tenant);
+
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>
$this->currentapp.'.uilocation.delete',
+
'location_code'=> $location['location_code'],
+
'type_id'=>
$type_id,
+
'lookup_tenant'=>$lookup_tenant
+
)
+
);
}
}
$j++;
@@ -294,7 +323,11 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
location'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.edit&type_id='
. $type_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=> $this->currentapp.'.uilocation.edit',
+
'type_id'=>$type_id
+
)
+
)
);
}
@@ -457,7 +490,12 @@
{
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
+ )
+ );
}
$get_history =
get_var('get_history',array('POST'));
@@ -725,7 +763,11 @@
}
$functions[$m]['name'] = 'lookup_'.
$attributes_values[$r]['name'] .'()';
- $functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook&column='
. $attributes_values[$r]['name']);
+ $functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>$this->currentapp.'.uilookup.addressbook',
+
'column'=> $attributes_values[$r]['name']
+
)
+
);
$functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
@@ -747,7 +789,11 @@
}
$lookup_functions[$m]['name'] =
'lookup_'. $attributes_values[$r]['name'] .'()';
- $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor&column='
. $attributes_values[$r]['name']);
+ $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=> $this->currentapp.'.uilookup.vendor',
+
'column'=> $attributes_values[$r]['name']
+
)
+
);
$lookup_functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
@@ -818,7 +864,7 @@
if($config[$j]['column_name']=='part_of_town_id')
{
- $edit_part_of_town=True;
+ $edit_part_of_town
= True;
$select_name_part_of_town
= 'part_of_town_id';
$part_of_town_list
=
$this->bocommon->select_part_of_town('select',$values['part_of_town_id']);
$lang_town_statustext
= lang('Select the part of town the property belongs to. To do not use
a part of town - select NO PART OF TOWN');
@@ -826,7 +872,7 @@
}
if($config[$j]['column_name']=='owner_id')
{
- $edit_owner=True;
+ $edit_owner
= True;
$lang_owner
= lang('Owner');
$owner_list
= $this->bo->get_owner_list('',$values['owner_id']);
$lang_select_owner
= lang('Select owner');
@@ -896,7 +942,13 @@
{
$entities_link[] = array
(
- 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
+ 'entity_link'
=> $GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>
$this->currentapp.'.uientity.index',
+
'entity_id'=>
$entity_entry['entity_id'],
+
'cat_id'=>
$entity_entry['cat_id'],
+
'query'=> $location_code
+
)
+
),
'lang_entity_statustext' => $entity_entry['descr'],
'text_entity'
=> $entity_entry['name'],
);
@@ -943,7 +995,7 @@
'onKeyUp'
=> $onKeyUp,
'onBlur'
=> $onBlur,
'dateformat_source'
=> './'.$this->currentapp.'/inc/dateformat.js',
- 'street_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.street'),
+ 'street_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.street')),
'lang_street'
=> lang('Street'),
'lang_select_street_help' =>
lang('Select the street name'),
'lang_street_num_statustext' => lang('Enter
the street number'),
@@ -951,7 +1003,7 @@
'value_street_name'
=> $values['street_name'],
'value_street_number' =>
$values['street_number'],
- 'tenant_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.tenant'),
+ 'tenant_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.tenant')),
'lang_tenant'
=> lang('tenant'),
'value_tenant_id'
=> $values['tenant_id'],
'value_last_name'
=> $values['last_name'],
@@ -962,7 +1014,7 @@
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&type_id='
. $type_id . '&lookup_tenant=' . $lookup_tenant),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.index','type_id'=> $type_id, 'lookup_tenant'=>
$lookup_tenant)),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
@@ -986,7 +1038,12 @@
{
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
+ )
+ );
}
$location_code =
get_var('location_code',array('GET'));
@@ -1012,7 +1069,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.delete&location_code='
. $location_code . '&type_id=' . $type_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.delete', 'location_code'=> $location_code,
'type_id'=> $type_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' => lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1030,10 +1087,14 @@
function view()
{
-
if(!$this->acl_read)
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uilocation.stop&perm=1&acl_location='
. $this->acl2_location);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array(
+
'menuaction' => $this->currentapp.'.uilocation.stop',
+ 'perm'
=> 1,
+
'acl_location' => $this->acl2_location
+ )
+ );
}
$get_history =
get_var('get_history',array('POST'));
@@ -1176,7 +1237,7 @@
}
$functions[$m]['name'] = 'lookup_'.
$attributes_values[$r]['name'] .'()';
- $functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook&column='
. $attributes_values[$r]['name']);
+ $functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.addressbook', 'column'=>
$attributes_values[$r]['name']));
$functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
@@ -1199,7 +1260,7 @@
$lookup_functions[$m]['name'] =
'lookup_'. $attributes_values[$r]['name'] .'()';
- $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor&column='
. $attributes_values[$r]['name']);
+ $lookup_functions[$m]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilookup.vendor', 'column'=>
$attributes_values[$r]['name']));
$lookup_functions[$m]['action'] =
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
}
@@ -1300,7 +1361,13 @@
{
$entities_link[] = array
(
- 'entity_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $entity_entry['entity_id'] . '&cat_id=' . $entity_entry['cat_id'] .
'&query=' . $location_code),
+ 'entity_link'
=> $GLOBALS['phpgw']->link('/index.php',array(
+
'menuaction'=>
$this->currentapp.'.uientity.index',
+
'entity_id'=>
$entity_entry['entity_id'],
+
'cat_id'=>
$entity_entry['cat_id'],
+
'query'=>$location_code
+
)
+
),
'lang_entity_statustext' => $entity_entry['descr'],
'text_entity'
=> $entity_entry['name'],
);
@@ -1357,13 +1424,13 @@
'size_first_name'
=> strlen($values['first_name']),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.index&type_id='
. $type_id . '&lookup_tenant=' . $lookup_tenant),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uilocation.index',
'type_id'=> $type_id,'lookup_tenant'=> $lookup_tenant)),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the location'),
'lang_edit'
=> lang('Edit'),
- 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.edit&location_code='
. $location_code . '&lookup_tenant=' . $lookup_tenant),
+ 'edit_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>$this->currentapp.'.uilocation.edit',
'location_code'=> $location_code, 'lookup_tenant'=> $lookup_tenant)),
'lang_edit_statustext' => lang('Edit
this entry'),
'lang_category'
=> lang('category'),
'lang_no_cat'
=> lang('no category'),
@@ -1408,7 +1475,7 @@
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
- 'update_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilocation.update_cat'),
+ 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$this->currentapp.'.uilocation.update_cat')),
'message' =>
$receipt['message'],
'lang_confirm_msg' =>
$lang_confirm_msg,
'lang_yes' =>
$lang_yes,
| [Prev in Thread] | Current Thread | [Next in Thread] |