[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.boentity.inc.php class.uicus...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.boentity.inc.php class.uicus... |
|
Date: |
Wed, 13 Sep 2006 18:29:17 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/13 18:29:17
Modified files:
inc : class.boentity.inc.php class.uicustom.inc.php
class.uidocument.inc.php class.uientity.inc.php
Log message:
link
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boentity.inc.php?cvsroot=phpgroupware&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uicustom.inc.php?cvsroot=phpgroupware&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uidocument.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24
Patches:
Index: class.boentity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boentity.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- class.boentity.inc.php 17 Apr 2006 11:36:05 -0000 1.19
+++ class.boentity.inc.php 13 Sep 2006 18:29:16 -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 entity
- * @version $Id: class.boentity.inc.php,v 1.19 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.boentity.inc.php,v 1.20 2006/09/13 18:29:16
sigurdne Exp $
*/
/**
@@ -314,7 +314,7 @@
}
$insert_record_entity[] =
$entity['attributes'][$i]['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook&column='
. $entity['attributes'][$i]['name']);
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uilookup.addressbook', 'column'=>
$entity['attributes'][$i]['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $entity['attributes'][$i]['name'] .'()';
$lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
@@ -336,7 +336,7 @@
}
$insert_record_entity[] =
$entity['attributes'][$i]['name'];
- $lookup_link =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.vendor&column='
. $entity['attributes'][$i]['name']);
+ $lookup_link =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uilookup.vendor', 'column'=>
$entity['attributes'][$i]['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $entity['attributes'][$i]['name'] .'()';
$lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$m++;
Index: class.uicustom.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uicustom.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- class.uicustom.inc.php 3 Feb 2006 12:05:49 -0000 1.13
+++ class.uicustom.inc.php 13 Sep 2006 18:29:16 -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 custom
- * @version $Id: class.uicustom.inc.php,v 1.13 2006/02/03 12:05:49
sigurdne Exp $
+ * @version $Id: class.uicustom.inc.php,v 1.14 2006/09/13 18:29:16
sigurdne Exp $
*/
/**
@@ -121,19 +121,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.'.uicustom.view&custom_id='
. $entry['custom_id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.view', 'custom_id'=> $entry['custom_id']));
}
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.'.uicustom.edit&custom_id='
. $entry['custom_id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.edit', 'custom_id'=> $entry['custom_id']));
}
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.'.uicustom.delete&custom_id='
. $entry['custom_id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.delete', 'custom_id'=> $entry['custom_id']));
}
$j++;
@@ -145,7 +145,7 @@
$table_header[$i]['header'] = lang('ID');
$table_header[$i]['width'] = '5%';
$table_header[$i]['align'] = 'center';
- $table_header[$i]['sort_link'] =true;
+ $table_header[$i]['sort_link'] = true;
$table_header[$i]['sort'] =
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
@@ -160,47 +160,47 @@
$table_header[$i]['header'] = lang('name');
$table_header[$i]['width'] = '5%';
$table_header[$i]['align'] = 'center';
- $table_header[$i]['sort_link'] =true;
+ $table_header[$i]['sort_link'] = true;
$table_header[$i]['sort'] =
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction'
=> $this->currentapp.'.uicustom.index',
-
'query' =>$this->query,
+
'query' => $this->query,
'start_date' => $start_date,
-
'end_date'=>$end_date)
+
'end_date' => $end_date)
));
$i++;
$table_header[$i]['header'] = lang('date');
$table_header[$i]['width'] = '5%';
$table_header[$i]['align'] = 'center';
- $table_header[$i]['sort_link'] =true;
+ $table_header[$i]['sort_link'] = true;
$table_header[$i]['sort'] =
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'name',
'order' => $this->order,
'extra' => array('menuaction'
=> $this->currentapp.'.uicustom.index',
-
'query' =>$this->query,
+
'query' => $this->query,
'start_date' => $start_date,
-
'end_date'=>$end_date)
+
'end_date' => $end_date)
));
$i++;
$table_header[$i]['header'] = lang('User');
$table_header[$i]['width'] = '5%';
$table_header[$i]['align'] = 'center';
- $table_header[$i]['sort_link'] =true;
+ $table_header[$i]['sort_link'] = true;
$table_header[$i]['sort'] =
$this->nextmatchs->show_sort_order(array
(
'sort' => $this->sort,
'var' => 'user_id',
'order' => $this->order,
'extra' => array('menuaction'
=> $this->currentapp.'.uicustom.index',
-
'query' =>$this->query,
+
'query' => $this->query,
'start_date' => $start_date,
-
'end_date'=>$end_date)
+
'end_date' => $end_date)
));
$i++;
@@ -234,18 +234,18 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
custom query'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.edit')
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.edit'))
);
}
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uicustom.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)
@@ -291,7 +291,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));
}
$custom_id =
get_var('custom_id',array('POST','GET'));
@@ -304,7 +304,6 @@
$this->bo->resort(array('custom_id'=>$custom_id,'id'=>$cols_id,'resort'=>$resort));
}
-
$GLOBALS['phpgw']->xslttpl->add_file(array('custom'));
if ($values['save'] || $values['apply'])
@@ -329,14 +328,14 @@
if ($values['save'])
{
$GLOBALS['phpgw']->session->appsession('session_data','custom_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uicustom.index');
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.index'));
}
}
}
if ($values['cancel'])
{
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uicustom.index');
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction'=> $this->currentapp.'.uicustom.index'));
}
@@ -364,8 +363,8 @@
'sorting' => $entry['sorting'],
'text_up' => lang('Up'),
'text_down' => lang('Down'),
- 'link_up' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.edit&resort=up&cols_id='
. $entry['id'] . '&custom_id=' . $custom_id),
- 'link_down' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.edit&resort=down&cols_id='
. $entry['id'] . '&custom_id=' . $custom_id)
+ 'link_up' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.edit', 'resort'=> 'up', 'cols_id'=> $entry['id'],
'custom_id'=> $custom_id)),
+ 'link_down' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.edit', 'resort'=> 'down', 'cols_id'=>
$entry['id'], 'custom_id'=> $custom_id)),
);
}
@@ -432,7 +431,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.delete&custom_id='
. $custom_id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.delete', 'custom_id'=> $custom_id)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -470,7 +469,6 @@
{
$content[$j]['row'][$i]['value'] =
$entry[$uicols[$i]['name']];
}
-
$j++;
}
}
@@ -484,7 +482,6 @@
//_debug_array($content);
-
$custom_name = $this->bo->read_custom_name($custom_id);
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('custom') . ': ' . $custom_name;
@@ -492,11 +489,11 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uicustom.view',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'custom_id'
=>$custom_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'custom_id' => $custom_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query
);
@@ -512,11 +509,11 @@
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uicustom.excel',
- 'sort' =>$this->sort,
- 'order' =>$this->order,
- 'filter' =>$this->filter,
- 'query' =>$this->query,
- 'custom_id' =>$custom_id,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'custom_id' => $custom_id,
'allrows' =>
$this->allrows
);
@@ -543,7 +540,7 @@
'table_header'
=> $table_header,
'values'
=> $content,
- 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uicustom.index'),
+ 'done_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uicustom.index')),
'lang_done' => lang('done'),
);
Index: class.uidocument.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.uidocument.inc.php 17 Jun 2006 08:45:56 -0000 1.14
+++ class.uidocument.inc.php 13 Sep 2006 18:29:16 -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 document
- * @version $Id: class.uidocument.inc.php,v 1.14 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uidocument.inc.php,v 1.15 2006/09/13 18:29:16
sigurdne Exp $
*/
/**
@@ -88,7 +88,7 @@
'status_id' => $this->status_id,
'entity_id' => $this->entity_id,
'doc_type' => $this->doc_type,
- 'query_location' => $this->query_location
+ 'query_location'=> $this->query_location
);
$this->bo->save_sessiondata($data);
}
@@ -97,7 +97,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('document','values','table_header',
@@ -145,7 +145,7 @@
$content[$j]['row'][]=
array(
'statustext'
=> lang('search'),
'text'
=> $document_entry[$uicols['name'][$k]],
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&query='
. $document_entry['query_location'][$uicols['name'][$k]] . '&entity_id=' .
$document_entry['p_entity_id'] . '&cat_id=' . $document_entry['p_cat_id'])
+ 'link'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.index', 'query'=>
$document_entry['query_location'][$uicols['name'][$k]], 'entity_id'=>
$document_entry['p_entity_id'], 'cat_id'=> $document_entry['p_cat_id']))
);
}
else
@@ -164,7 +164,7 @@
$content[$j]['row'][]= array(
'statustext'
=> lang('view documents for this location/entity'),
'text'
=> lang('documents'),
- 'link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
. $document_entry['location_code'] . '&p_num=' . $document_entry['p_num'] .
'&entity_id=' . $document_entry['p_entity_id'] . '&cat_id=' .
$document_entry['p_cat_id'] . '&doc_type=' . $this->doc_type)
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.list_doc', 'location_code'=>
$document_entry['location_code'], 'p_num'=> $document_entry['p_num'],
'entity_id'=> $document_entry['p_entity_id'], 'cat_id'=>
$document_entry['p_cat_id'], 'doc_type'=> $this->doc_type))
);
}
@@ -187,12 +187,12 @@
'var' => 'location_code',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'doc_type'
=>$this->doc_type,
-
'entity_id'
=>$this->entity_id)
+
'cat_id' =>
$this->cat_id,
+
'doc_type' =>
$this->doc_type,
+
'entity_id' =>
$this->entity_id)
));
}
if($uicols['name'][$i]=='document_id')
@@ -204,12 +204,12 @@
'var' => 'document_id',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'doc_type'
=>$this->doc_type,
-
'entity_id'
=>$this->entity_id)
+
'cat_id' =>
$this->cat_id,
+
'doc_type' =>
$this->doc_type,
+
'entity_id' =>
$this->entity_id)
));
}
if($uicols['name'][$i]=='address')
@@ -221,12 +221,12 @@
'var' => 'address',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.index',
-
'type_id'
=>$type_id,
-
'query'
=>$this->query,
+
'type_id' =>
$type_id,
+
'query' =>
$this->query,
'district_id' =>
$this->district_id,
-
'cat_id'
=>$this->cat_id,
-
'doc_type'
=>$this->doc_type,
-
'entity_id'
=>$this->entity_id)
+
'cat_id' =>
$this->cat_id,
+
'doc_type' =>
$this->doc_type,
+
'entity_id' =>
$this->entity_id)
));
}
}
@@ -246,7 +246,7 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
document'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&entity_id='
. $this->entity_id . '&cat_id=' . $this->cat_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.edit', 'entity_id'=> $this->entity_id,
'cat_id'=> $this->cat_id))
);
}
@@ -254,15 +254,15 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uidocument.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'filter'
=>$this->filter,
- 'status_id'
=>$this->status_id,
- 'query'
=>$this->query,
- 'doc_type'
=>$this->doc_type,
- 'entity_id'
=>$this->entity_id
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'district_id' => $this->district_id,
+ 'filter' => $this->filter,
+ 'status_id' => $this->status_id,
+ 'query' => $this->query,
+ 'doc_type' => $this->doc_type,
+ 'entity_id' => $this->entity_id
);
if($this->entity_id)
@@ -281,7 +281,7 @@
$data = array
(
- 'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&cat_id='
. $this->cat_id),
+ 'link_history'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.index', 'cat_id'=> $this->cat_id)),
'lang_history_statustext' =>
lang('search for history at this location'),
'lang_select'
=> lang('select'),
'links'
=> $links,
@@ -341,7 +341,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));
}
$preserve =
get_var('preserve',array('POST','GET'));
@@ -430,7 +430,7 @@
{
if(!$link_to_files)
{
- $link_view_file =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view_file&document_id='
. $document['document_id'] . '&entity_id=' . $this->entity_id . '&cat_id=' .
$this->cat_id . '&p_num=' . $p_num);
+ $link_view_file =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.view_file', 'document_id'=>
$document['document_id'], 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id, 'p_num'=> $p_num));
$link_to_files = $files_url;
}
}
@@ -445,9 +445,9 @@
'doc_type'
=> $document['doc_type'],
'link_view_file'
=> $link_view_file,
'link_to_files'
=> $link_to_files,
- 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view&document_id='
. $document['document_id'] . '&from=list_doc'),
- 'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document['document_id'] . '&from=list_doc'),
- 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document['document_id'] . '&location_code=' . $location_code . '&p_num=' .
$p_num),
+ 'link_view'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.view', 'document_id'=> $document['document_id'],
'from'=> 'list_doc')),
+ 'link_edit'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.edit', 'document_id'=> $document['document_id'],
'from'=> 'list_doc')),
+ 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.delete', 'document_id'=>
$document['document_id'], 'location_code'=> $location_code, 'p_num'=> $p_num)),
'lang_view_file_statustext' =>
lang('view the document'),
'lang_view_statustext' =>
lang('view information about the document'),
'lang_edit_statustext' =>
lang('edit information about the document'),
@@ -467,14 +467,14 @@
'var' => 'document_name',
'order' => $this->order,
'extra' => array('menuaction' =>
$this->currentapp.'.uidocument.list_doc',
-
'entity_id'
=>$this->entity_id,
-
'cat_id'
=>$this->cat_id,
-
'doc_type'
=>$this->doc_type,
-
'p_num'
=>$p_num,
-
'location_code'
=>$location_code,
-
'filter'
=>$this->filter,
-
'query'
=>$this->query,
-
'query_location'
=>$this->query_location
+
'entity_id' => $this->entity_id,
+
'cat_id' => $this->cat_id,
+
'doc_type' => $this->doc_type,
+
'p_num' => $p_num,
+
'location_code' => $location_code,
+
'filter' => $this->filter,
+
'query' => $this->query,
+
'query_location' => $this->query_location
)
)),
'lang_document_name' => lang('Document
name'),
@@ -490,14 +490,14 @@
$link_data_add = array
(
'menuaction' =>
$this->currentapp.'.uidocument.edit',
- 'location_code'
=>$location_code,
- 'p_entity_id'
=>$this->entity_id,
- 'entity_id'
=>$this->entity_id,
- 'p_cat_id'
=>$this->cat_id,
- 'cat_id'
=>$this->cat_id,
- 'p_num'
=>$p_num,
- 'from'
=>'list_doc',
- 'bypass'
=>True
+ 'location_code' => $location_code,
+ 'p_entity_id' => $this->entity_id,
+ 'entity_id' => $this->entity_id,
+ 'p_cat_id' => $this->cat_id,
+ 'cat_id' => $this->cat_id,
+ 'p_num' => $p_num,
+ 'from' => 'list_doc',
+ 'bypass' => True
);
$table_add[] = array
@@ -510,16 +510,16 @@
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uidocument.list_doc',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'entity_id'
=>$this->entity_id,
- 'cat_id'
=>$this->cat_id,
- 'p_num'
=>$p_num,
- 'doc_type'
=>$this->doc_type,
- 'location_code'
=>$location_code,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'query_location'
=>$this->query_location
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'entity_id' => $this->entity_id,
+ 'cat_id' => $this->cat_id,
+ 'p_num' => $p_num,
+ 'doc_type' => $this->doc_type,
+ 'location_code' => $location_code,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'query_location'=> $this->query_location
);
@@ -544,10 +544,10 @@
(
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'location_data'
=> $location_data,
- 'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
+ 'link_history'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.list_doc', 'cat_id'=> $this->cat_id)),
'lang_history_statustext' =>
lang('search for history at this location'),
'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,
@@ -587,7 +587,7 @@
'table_header_document' =>
$table_header,
'values_document'
=> $content,
'table_add'
=> $table_add,
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.index&preserve=1'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.index', 'preserve'=> 1)),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list')
);
@@ -609,7 +609,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));
}
$document_id =
get_var('document_id',array('POST','GET'));
@@ -658,7 +658,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'));
@@ -681,7 +681,7 @@
$bypass =
get_var('bypass',array('POST','GET'));
- $receipt = $this->bo->create_home_dir();
+ $receipt= $this->bo->create_home_dir();
if($_POST && !$bypass)
{
@@ -817,7 +817,7 @@
$receipt =
$this->bo->save($values);
//
$document_id=$receipt['document_id'];
$GLOBALS['phpgw']->session->appsession('session_data','document_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
.implode("-", $values['location']) . '&entity_id=' . $this->entity_id .
'&cat_id=' . $this->cat_id . '&p_num=' . $values['extra']['p_num'] );
+
$GLOBALS['phpgw']->redirect_link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.list_doc', 'location_code'=> implode("-",
$values['location']), 'entity_id'=> $this->entity_id, 'cat_id'=> $this->cat_id,
'p_num'=> $values['extra']['p_num']));
}
}
else
@@ -892,8 +892,8 @@
'document_id' => $document_id,
'from' => $from,
'location_code' =>
$values['location_code'],
- 'entity_id'
=>$this->entity_id,
- 'cat_id' =>$this->cat_id,
+ 'entity_id' => $this->entity_id,
+ 'cat_id' => $this->cat_id,
);
$dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
@@ -937,7 +937,7 @@
'lang_save'
=> lang('save'),
'lang_save_statustext' =>
lang('Save the document'),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.'
.$from . '&location_code=' . $location_code . '&entity_id=' . $this->entity_id
. '&cat_id=' . $this->cat_id . '&p_num=' . $p_num . '&preserve=1'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.' .$from, 'location_code'=> $location_code,
'entity_id'=> $this->entity_id, 'cat_id'=> $this->cat_id, 'p_num'=> $p_num,
'preserve'=> 1)),
'lang_done'
=> lang('done'),
'lang_done_statustext' =>
lang('Back to the list'),
@@ -1006,7 +1006,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));
}
$location_code =
get_var('location_code',array('POST','GET'));
@@ -1032,7 +1032,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document_id . '&location_code=' . $location_code . '&p_num=' . $p_num),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.delete', 'document_id'=> $document_id,
'location_code'=> $location_code, 'p_num'=> $p_num)),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
'lang_yes_statustext' => lang('Delete the
entry'),
@@ -1053,7 +1053,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));
}
$from =
get_var('from',array('POST','GET'));
@@ -1121,7 +1121,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.'.uidocument.'
.$from . '&location_code=' . $values['location_code'] . '&entity_id=' .
$values['p_entity_id'] . '&cat_id=' . $values['p_cat_id'] . '&preserve=1'),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.' .$from, 'location_code'=>
$values['location_code'], 'entity_id'=> $values['p_entity_id'], 'cat_id'=>
$values['p_cat_id'], 'preserve'=> 1)),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
@@ -1177,7 +1177,7 @@
'lang_branch'
=> lang('branch'),
'lang_branch_statustext' =>
lang('Select the branch for this document'),
- 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document_id . '&from=' . $from),
+ 'edit_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uidocument.edit', 'document_id'=> $document_id, 'from'=>
$from)),
'lang_edit_statustext'
=> lang('Edit this entry'),
'lang_edit'
=> lang('Edit')
);
@@ -1188,8 +1188,5 @@
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
// $GLOBALS['phpgw']->xslttpl->pp();
}
-
-
-
}
?>
Index: class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.uientity.inc.php 17 Jun 2006 08:45:56 -0000 1.23
+++ class.uientity.inc.php 13 Sep 2006 18:29:17 -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 entity
- * @version $Id: class.uientity.inc.php,v 1.23 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.24 2006/09/13 18:29:17
sigurdne Exp $
*/
/**
@@ -218,7 +218,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')));
@@ -256,7 +256,7 @@
{
if(!$this->acl_read && $this->cat_id)
{
-
$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('entity',
@@ -286,7 +286,7 @@
{
$content[$j]['row'][$i]['statustext'] = lang('search');
$content[$j]['row'][$i]['text'] =
$entity_entry[$uicols['name'][$i]];
-
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id=' . $this->cat_id .'&query=' .
$entity_entry['query_location'][$uicols['name'][$i]]);
+
$content[$j]['row'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id, 'query'=> $entity_entry['query_location'][$uicols['name'][$i]]));
}
else
{
@@ -307,19 +307,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.'.uientity.view&entity_id='
. $this->entity_id . '&cat_id=' . $this->cat_id .'&id=' . $entity_entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.view', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id, 'id'=> $entity_entry['id']));
}
if($this->acl_edit)
{
$content[$j]['row'][$i]['statustext'] = lang('edit the
entity');
$content[$j]['row'][$i]['text']
= lang('edit');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.edit&entity_id='
. $this->entity_id . '&cat_id=' . $this->cat_id .'&id=' . $entity_entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.edit', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id, 'id'=> $entity_entry['id']));
}
if($this->acl_delete)
{
$content[$j]['row'][$i]['statustext'] = lang('delete the
entity');
$content[$j]['row'][$i]['text']
= lang('delete');
-
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.delete&entity_id='
. $this->entity_id . '&cat_id=' . $this->cat_id .'&id=' . $entity_entry['id']);
+
$content[$j]['row'][$i++]['link'] =
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.delete', 'entity_id'=> $this->entity_id,
'cat_id'=> $this->cat_id, 'id'=> $entity_entry['id']));
}
$j++;
@@ -342,14 +342,14 @@
'var' =>
$uicols['name'][$i],
'order' =>
$this->order,
'extra'
=> array('menuaction' => $this->currentapp.'.uientity.index',
-
'type_id' =>$type_id,
-
'query' =>$this->query,
-
'lookup' =>$lookup,
+
'type_id' => $type_id,
+
'query' => $this->query,
+
'lookup' => $lookup,
'district_id' => $this->district_id,
-
'entity_id' =>$this->entity_id,
-
'cat_id' =>$this->cat_id,
-
'start_date'=>$start_date,
-
'end_date'=>$end_date)
+
'entity_id' => $this->entity_id,
+
'cat_id' => $this->cat_id,
+
'start_date' => $start_date,
+
'end_date' => $end_date)
));
}
}
@@ -384,38 +384,38 @@
(
'lang_add'
=> lang('add'),
'lang_add_statustext' => lang('add a
entity'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.edit&entity_id='.
$this->entity_id .'&cat_id='. $this->cat_id)
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.edit', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id))
);
}
$link_data = array
(
'menuaction' =>
$this->currentapp.'.uientity.index',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'cat_id'
=>$this->cat_id,
- 'entity_id'
=>$this->entity_id,
- 'district_id'
=>$this->district_id,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'start_date' =>$start_date,
- 'end_date'
=>$end_date
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'cat_id' => $this->cat_id,
+ 'entity_id' => $this->entity_id,
+ 'district_id' => $this->district_id,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'start_date' => $start_date,
+ 'end_date' => $end_date
);
$link_excel = array
(
'menuaction' =>
$this->currentapp.'.uientity.excel',
- 'sort'
=>$this->sort,
- 'order'
=>$this->order,
- 'entity_id'
=>$this->entity_id,
- 'cat_id'
=>$this->cat_id,
- 'district_id'
=>$this->district_id,
- 'status_id'
=>$this->status,
- 'filter'
=>$this->filter,
- 'query'
=>$this->query,
- 'start_date' =>$start_date,
- 'end_date'
=>$end_date,
- 'start' =>$this->start
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'entity_id' => $this->entity_id,
+ 'cat_id' => $this->cat_id,
+ 'district_id' => $this->district_id,
+ 'status_id' => $this->status,
+ 'filter' => $this->filter,
+ 'query' => $this->query,
+ 'start_date' => $start_date,
+ 'end_date' => $end_date,
+ 'start' => $this->start
);
$link_columns = array
@@ -425,7 +425,7 @@
'cat_id'
=>$this->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'));
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'])
{
@@ -532,7 +532,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));
}
$config =
CreateObject('phpgwapi.config',$this->currentapp);
@@ -563,7 +563,6 @@
if($_POST && !$bypass)
{
-
for ($i=0;
$i<count($insert_record['location']); $i++)
{
if($_POST[$insert_record['location'][$i]])
@@ -847,10 +846,10 @@
$link_file_data = array
(
'menuaction' =>
$this->currentapp.'.uientity.view_file',
- 'loc1'
=>$values['location_data']['loc1'],
- 'id' =>$id,
- 'cat_id'
=>$this->cat_id,
- 'entity_id'
=>$this->entity_id
+ 'loc1' =>
$values['location_data']['loc1'],
+ 'id' => $id,
+ 'cat_id' => $this->cat_id,
+ 'entity_id' => $this->entity_id
);
@@ -879,7 +878,7 @@
//_debug_array($values['origin']);
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']);
@@ -965,7 +964,7 @@
'location_data'
=> $location_data,
'lookup_type'
=> $lookup_type,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id='. $this->cat_id),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id)),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
'lang_id'
=> lang('ID'),
@@ -992,7 +991,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'));
@@ -1016,7 +1015,7 @@
$data = array
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.delete&entity_id='
. $this->entity_id .'&cat_id=' . $this->cat_id . '&id=' . $id),
+ 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.delete', 'entity_id'=> $this->entity_id,
'cat_id'=> $this->cat_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'),
@@ -1036,7 +1035,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));
}
$config =
CreateObject('phpgwapi.config',$this->currentapp);
@@ -1126,10 +1125,10 @@
$link_file_data = array
(
'menuaction' =>
$this->currentapp.'.uientity.view_file',
- 'loc1'
=>$values['location_data']['loc1'],
- 'id' =>$id,
- 'cat_id'
=>$this->cat_id,
- 'entity_id'
=>$this->entity_id
+ 'loc1' =>
$values['location_data']['loc1'],
+ 'id' => $id,
+ 'cat_id' => $this->cat_id,
+ 'entity_id' => $this->entity_id
);
$config->read_repository();
@@ -1145,7 +1144,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']);
@@ -1211,7 +1210,7 @@
'location_data'
=> $location_data,
'lookup_type'
=> $lookup_type,
'edit_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uientity.index&entity_id='
. $this->entity_id . '&cat_id='. $this->cat_id),
+ 'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id)),
'lang_category'
=> lang('category'),
'lang_edit'
=> lang('Edit'),
'lang_done'
=> lang('done'),
@@ -1313,7 +1312,6 @@
'all_records' =>
$this->bo->total_records,
'link_url' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
'img_path' =>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
-
'values' => $content,
'table_header' =>
$table_header,
);
@@ -1322,7 +1320,7 @@
$appname = $attrib_data['input_text'];
$function_msg = lang('history');
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
_debug_array($GLOBALS['phpgw_info']['flags']['app_header']);
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
//_debug_array($GLOBALS['phpgw_info']['flags']['app_header']);
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_history' => $data));
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.boentity.inc.php class.uicus...,
Sigurd Nes <=