[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.solocation.inc.php class.uil...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.solocation.inc.php class.uil... |
|
Date: |
Tue, 05 Sep 2006 12:46:02 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/05 12:46:02
Modified files:
inc : class.solocation.inc.php
class.uilocation.inc.php class.bocommon.inc.php
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uilocation.inc.php?cvsroot=phpgroupware&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.bocommon.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
Patches:
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- class.solocation.inc.php 17 Apr 2006 11:36:05 -0000 1.29
+++ class.solocation.inc.php 5 Sep 2006 12:46:01 -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.solocation.inc.php,v 1.29 2006/04/17 11:36:05
sigurdne Exp $
+ * @version $Id: class.solocation.inc.php,v 1.30 2006/09/05 12:46:01
sigurdne Exp $
*/
/**
@@ -437,12 +437,12 @@
if ($cat_id > 0)
{
- $filtermethod .= " $where fm_location" .
($type_id). ".category=$cat_id ";
+ $filtermethod = " $where fm_location" .
($type_id). ".category=$cat_id ";
$where= 'AND';
}
else
{
- $filtermethod .= " $where (fm_location" .
($type_id). ".category !=99 OR fm_location" . ($type_id). ".category IS NULL)";
+ $filtermethod = " $where (fm_location" .
($type_id). ".category !=99 OR fm_location" . ($type_id). ".category IS NULL)";
$where= 'AND';
}
@@ -485,6 +485,8 @@
$where= 'AND';
}
+ $querymethod = '';
+
if($query)
{
$query = str_replace(",",'.',$query);
@@ -541,7 +543,8 @@
$location_list[$j][$cols_return[$i]] =
stripslashes($this->db->f($cols_return[$i]));
$value = $this->db->f($cols_return[$i]);
- if($uicols['cols_return_extra'][$i])
+
+
if(isset($uicols['cols_return_extra'][$i]))
{
if(($uicols['cols_return_extra'][$i]['datatype']=='R' ||
$uicols['cols_return_extra'][$i]['datatype']=='LB') && $value):
{
Index: class.uilocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- class.uilocation.inc.php 17 Jun 2006 08:45:56 -0000 1.27
+++ class.uilocation.inc.php 5 Sep 2006 12:46:01 -0000 1.28
@@ -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.27 2006/06/17 08:45:56
sigurdne Exp $
+ * @version $Id: class.uilocation.inc.php,v 1.28 2006/09/05 12:46:01
sigurdne Exp $
*/
/**
@@ -157,8 +157,7 @@
if($uicols['input_type'][$i]!='hidden')
{
-
-
if($location['query_location'][$uicols['name'][$i]])
+
if(isset($location['query_location'][$uicols['name'][$i]]))
{
$content[$j]['row'][$i]['statustext'] = lang('search');
$content[$j]['row'][$i]['text'] =
$location[$uicols['name'][$i]];
@@ -317,6 +316,7 @@
$input_name =
$GLOBALS['phpgw']->session->appsession('lookup_fields',$this->currentapp);
+ $function_exchange_values = '';
for ($k=0;$k<count($input_name);$k++)
{
$function_exchange_values .=
"opener.document.form." . $input_name[$k] . ".value = '';" ."\r\n";
@@ -360,7 +360,7 @@
$record_limit = $this->bo->total_records;
}
-
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter']
== 'owner')
+
if(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter'])
&&
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter']
== 'owner')
{
$owner_list =
$this->bo->get_owner_list('filter', $this->filter);
}
Index: class.bocommon.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.bocommon.inc.php 25 Jun 2006 17:24:06 -0000 1.32
+++ class.bocommon.inc.php 5 Sep 2006 12:46:01 -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 core
- * @version $Id: class.bocommon.inc.php,v 1.32 2006/06/25 17:24:06
sigurdne Exp $
+ * @version $Id: class.bocommon.inc.php,v 1.33 2006/09/05 12:46:01
sigurdne Exp $
*/
/**
@@ -66,7 +66,7 @@
$this->socommon =
CreateObject($this->currentapp.'.socommon',$this->currentapp);
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- if (!is_object($GLOBALS['phpgw']->asyncservice))
+ if (!isset($GLOBALS['phpgw']->asyncservice))
{
$GLOBALS['phpgw']->asyncservice =
CreateObject('phpgwapi.asyncservice');
}
@@ -1218,17 +1218,13 @@
break;
}
- if (!is_object($socategory))
- {
$socategory =
CreateObject($this->currentapp.'.socategory');
- }
$categories=
$socategory->select_category_list(array('type'=>$data['type'],
'type_id'=>$data['type_id'],
'order' =>$data['order']));
return
$this->select_list($data['selected'],$categories);
-
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.solocation.inc.php class.uil...,
Sigurd Nes <=