[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc/class.solocation.inc.php, 1.1.1.5
From: |
nomail |
Subject: |
[Phpgroupware-cvs] property/inc/class.solocation.inc.php, 1.1.1.5 |
Date: |
Sun, 30 May 2004 01:23:56 +0200 |
Update of /property/inc
Modified Files:
Branch:
class.solocation.inc.php
date: 2004/05/29 23:23:56; author: sigurdne; state: Exp; lines: +0 -60
Log Message:
no message
=====================================================================
Index: property/inc/class.solocation.inc.php
diff -u property/inc/class.solocation.inc.php:1.1.1.4
property/inc/class.solocation.inc.php:1.1.1.5
--- property/inc/class.solocation.inc.php:1.1.1.4 Tue May 25 21:15:22 2004
+++ property/inc/class.solocation.inc.php Sat May 29 23:23:56 2004
@@ -80,22 +80,6 @@
}
- function get_tenant_status($type)
- {
- $sql= "SELECT * from fm_tenant_status WHERE type
='$type' ";
- $this->db->query($sql,__LINE__,__FILE__);
-
- $i = 0;
- while ($this->db->next_record())
- {
- $status[$i]['id']
= $this->db->f('id');
- $status[$i]['name']
= $this->db->f('id') . ' [' . stripslashes($this->db->f('descr')) .']';
- $i++;
- }
- return $status;
- }
-
-
function get_owner_type_list()
{
$this->db->query("SELECT id,descr FROM
fm_owner_category ORDER BY descr ");
@@ -179,8 +163,6 @@
$lookup_tenant =
(isset($data['lookup_tenant'])?$data['lookup_tenant']:'');
$district_id =
(isset($data['district_id'])?$data['district_id']:'');
$allrows =
(isset($data['allrows'])?$data['allrows']:'');
- $status_eco_id =
(isset($data['status_eco_id'])?$data['status_eco_id']:'');
- $status_drift_id =
(isset($data['status_drift_id'])?$data['status_drift_id']:'');
$lookup =
(isset($data['lookup'])?$data['lookup']:'');
$status =
(isset($data['status'])?$data['status']:'');
@@ -328,25 +310,6 @@
$uicols['statustext'][] =
lang('contact phone');
$uicols['exchange'][] = True;
- if(!$lookup)
- {
- $cols.= ',fm_tenant.status_eco';
- $cols_return[]
= 'status_eco';
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= 'status_eco';
- $uicols['descr'][]
= lang('status eco');
- $uicols['statustext'][]
= lang('status eco');
- $uicols['exchange'][]
= False;
-
- $cols.=
',fm_tenant.status_drift';
- $cols_return[]
= 'status_drift';
- $uicols['input_type'][]
= 'text';
- $uicols['name'][]
= 'status_drift';
- $uicols['descr'][]
= lang('status drift');
- $uicols['statustext'][]
= lang('status drift');
- $uicols['exchange'][]
= False;
- }
-
$sub_query_tenant=1;
$this->socommon->fm_cache('sub_query_tenant_'. $type_id . '_' . $lookup_tenant
. '_' . $lookup,$sub_query_tenant);
}
@@ -505,29 +468,6 @@
}
$where= 'AND';
}
-
- if ($status_eco_id > 0)
- {
- $filtermethod .= " $where
(fm_tenant.status_eco=$status_eco_id ";
- $and='OR';
- }
- else
- {
- $and='AND (';
- }
-
- if ($status_drift_id > 0)
- {
- $filtermethod .= " $and
fm_tenant.status_drift=$status_drift_id ) ";
- }
- else
- {
- if ($status_eco_id > 0)
- {
- $filtermethod .= ')';
- }
- }
-
$sql .= "$filtermethod $querymethod";
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc/class.solocation.inc.php, 1.1.1.5,
nomail <=