[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.bolocation.inc.php class.sol...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.bolocation.inc.php class.sol... |
|
Date: |
Mon, 18 Sep 2006 09:08:04 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/18 09:08:04
Modified files:
inc : class.bolocation.inc.php
class.solocation.inc.php
class.uilocation.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bolocation.inc.php?cvsroot=phpgroupware&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
Patches:
Index: class.bolocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- class.bolocation.inc.php 17 Sep 2006 19:30:43 -0000 1.18
+++ class.bolocation.inc.php 18 Sep 2006 09:08:04 -0000 1.19
@@ -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.bolocation.inc.php,v 1.18 2006/09/17 19:30:43
sigurdne Exp $
+ * @version $Id: class.bolocation.inc.php,v 1.19 2006/09/18 09:08:04
sigurdne Exp $
*/
/**
@@ -283,29 +283,26 @@
$lookup_functions[$i]['link']
= $location_link .'&type_id=' . ($i+1) .
'&lookup_name=' . $i;
$lookup_functions[$i]['action']
=
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
- if($data['no_link']>=($i+3))
+ if(isset($data['no_link']) &&
$data['no_link']>=($i+3))
{
$location['location'][$i]['lookup_link'] = False;
- $lookup_functions[$i]['link']
= $location_link .'&type_id=' . ($data['no_link']-1) .
'&lookup_name=' . ($data[no_link]-2);
+ $lookup_functions[$i]['link']
= $location_link .'&type_id=' . ($data['no_link']-1) .
'&lookup_name=' . ($data['no_link']-2);
$lookup_functions[$i]['action']
=
'Window1=window.open(link,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
- $location['location'][$i]['statustext']
= lang('Klick this link to select') . ' ' .
$location_types[($data[no_link]-2)]['name'];
+ $location['location'][$i]['statustext']
= lang('Klick this link to select') . ' ' .
$location_types[($data['no_link']-2)]['name'];
}
-
- if($data['query_link'] && $i <
($data['type_id']-1))
+ if(isset($data['query_link']) && $i <
($data['type_id']-1))
{
for ($j=1;$j<$i+2;$j++)
{
$temp_location[]=
$data['values']['loc' . ($j)];
}
-
$data['link_data']['query_location']
= implode('-',$temp_location);
$location['location'][$i]['query_link']
=
$GLOBALS['phpgw']->link('/index.php',$data['link_data']);
unset($temp_location);
}
-
$m=$i;
}
@@ -502,6 +499,7 @@
if(isset($lookup_functions) &&
is_array($lookup_functions))
{
+ $location['lookup_functions'] = '';
for ($j=0;$j<count($lookup_functions);$j++)
{
$location['lookup_functions'] .=
"\t".'function ' . $lookup_functions[$j]['name'] ."\n";
@@ -513,7 +511,6 @@
}
}
-
if(isset($location) && is_array($location))
{
for ($i=0;$i<count($location['location']);$i++)
@@ -720,11 +717,8 @@
function get_history($location_code)
{
$history = $this->so->get_history($location_code);
- $this->total_records = $this->so->total_records;
$this->uicols = $this->so->uicols;
-
return $history;
-
}
}
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- class.solocation.inc.php 18 Sep 2006 08:22:32 -0000 1.34
+++ class.solocation.inc.php 18 Sep 2006 09:08:04 -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 location
- * @version $Id: class.solocation.inc.php,v 1.34 2006/09/18 08:22:32
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.35 2006/09/18 09:08:04
sigurdne Exp $
*/
/**
@@ -84,8 +84,11 @@
);
}
+ if (isset($entity))
+ {
return $entity;
}
+ }
function select_status_list($type_id)
{
@@ -817,7 +820,7 @@
return;
}
- $cols.= 'fm_location' . $type_id .'.category as
cat_id,';
+ $cols = 'fm_location' . $type_id .'.category as
cat_id,';
$cols_return[] = 'cat_id';
for ($i=1;$i<($type_id+1);$i++)
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.uilocation.inc.php 17 Sep 2006 19:30:43 -0000 1.32
+++ class.uilocation.inc.php 18 Sep 2006 09:08:04 -0000 1.33
@@ -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.32 2006/09/17 19:30:43
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.33 2006/09/18 09:08:04
sigurdne Exp $
*/
/**
@@ -616,7 +616,6 @@
{
$content[$j]['row'][$k]['value'] = $entry[$uicols['name'][$i]];
$content[$j]['row'][$k]['name'] = $uicols['name'][$i];
-
$content[$j]['row'][$k]['lookup'] = $lookup;
}
$content[$j]['hidden'][$k]['value'] = $entry[$uicols['name'][$i]];
@@ -980,17 +979,17 @@
'entities_link'
=> (isset($entities_link)?$entities_link:''),
'edit_street'
=> (isset($edit_street)?$edit_street:''),
'edit_tenant'
=> (isset($edit_tenant)?$edit_tenant:''),
- 'edit_part_of_town'
=> $edit_part_of_town,
- 'edit_owner'
=> $edit_owner,
- 'select_name_part_of_town'
=> $select_name_part_of_town,
- 'part_of_town_list'
=> $part_of_town_list,
- 'lang_town_statustext'
=> $lang_town_statustext,
+ 'edit_part_of_town'
=> (isset($edit_part_of_town)?$edit_part_of_town:''),
+ 'edit_owner'
=> (isset($edit_owner)?$edit_owner:''),
+ 'select_name_part_of_town'
=> (isset($select_name_part_of_town)?$select_name_part_of_town:''),
+ 'part_of_town_list'
=> (isset($part_of_town_list)?$part_of_town_list:''),
+ 'lang_town_statustext'
=> (isset($lang_town_statustext)?$lang_town_statustext:''),
'lang_part_of_town'
=> lang('Part of town'),
'lang_no_part_of_town'
=> lang('No part of town'),
- 'lang_owner'
=> $lang_owner,
- 'owner_list'
=> $owner_list,
- 'lang_select_owner'
=> $lang_select_owner,
- 'lang_owner_statustext'
=> $lang_owner_statustext,
+ 'lang_owner'
=> (isset($lang_owner)?$lang_owner:''),
+ 'owner_list'
=> (isset($owner_list)?$owner_list:''),
+ 'lang_select_owner'
=> (isset($lang_select_owner)?$lang_select_owner:''),
+ 'lang_owner_statustext'
=> (isset($lang_owner_statustext)?$lang_owner_statustext:''),
'additional_fields'
=> $additional_fields,
'attributes_values'
=> $attributes_values,
'lookup_functions'
=> (isset($lookup_functions)?$lookup_functions:''),
@@ -1006,18 +1005,18 @@
'lang_street'
=> lang('Street'),
'lang_select_street_help'
=> lang('Select the street name'),
'lang_street_num_statustext'
=> lang('Enter the street number'),
- 'value_street_id'
=> $values['street_id'],
- 'value_street_name'
=> $values['street_name'],
- 'value_street_number'
=> $values['street_number'],
+ 'value_street_id'
=> (isset($values['street_id'])?$values['street_id']:''),
+ 'value_street_name'
=> (isset($values['street_name'])?$values['street_name']:''),
+ 'value_street_number'
=> (isset($values['street_number'])?$values['street_number']:''),
'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'],
- 'value_first_name'
=> $values['first_name'],
+ 'value_last_name'
=> (isset($values['last_name'])?$values['last_name']:''),
+ 'value_first_name'
=> (isset($values['first_name'])?$values['first_name']:''),
'lang_tenant_statustext'
=> lang('Select a tenant'),
- 'size_last_name'
=> strlen($values['last_name']),
- 'size_first_name'
=> strlen($values['first_name']),
+ 'size_last_name'
=> (isset($values['last_name'])?strlen($values['last_name']):''),
+ 'size_first_name'
=> (isset($values['first_name'])?strlen($values['first_name']):''),
'lookup_type'
=> $lookup_type,
'location_data'
=> $location_data,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -1054,7 +1053,7 @@
}
$location_code =
get_var('location_code',array('GET'));
- $type_id =
get_var('type_id',array('GET',POST));
+ $type_id =
get_var('type_id',array('GET','POST'));
$confirm = get_var('confirm',array('POST'));
@@ -1390,12 +1389,12 @@
'check_history' =>
$check_history,
'lang_history' =>
lang('History'),
'lang_history_statustext' =>
lang('Fetch the history for this item'),
- 'table_header' =>
$table_header,
+ 'table_header' =>
(isset($table_header)?$table_header:''),
'change_type_list' =>
$change_type_list,
- 'values' =>
$content,
+ 'values' =>
(isset($content)?$content:''),
'lang_related_info' =>
lang('related info'),
- 'entities_link' =>
$entities_link,
+ 'entities_link' =>
(isset($entities_link)?$entities_link:''),
'edit_street' =>
$edit_street,
'edit_tenant' =>
$edit_tenant,
'edit_part_of_town' =>
$edit_part_of_town,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.bolocation.inc.php class.sol...,
Sigurd Nes <=