[Phpgroupware-cvs] property/class.solocation.php, 1.1.1.2

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.solocation.php

date: 2004/06/13 12:16:54;  author: sigurdne;  state: Exp;  lines: +0 -60

Log Message:
no message
=====================================================================
Index: property/class.solocation.php
diff -u property/class.solocation.php:1.1.1.1 
property/class.solocation.php:1.1.1.2
--- property/class.solocation.php:1.1.1.1       Wed Jun  2 20:07:05 2004
+++ property/class.solocation.php       Sun Jun 13 12:16:54 2004
@@ -84,23 +84,6 @@
                }
 
 
-               function get_tenant_status($type)
-               {
-                       $sql= "SELECT * from fm_tenant_status WHERE type 
='$type' ";
-                       $dbresult = $GLOBALS['phpgw']->db->Execute($sql);
-
-                       $i = 0;
-                       while (!$dbresult->EOF)
-                       {
-                               $status[$i]['id']                               
= $dbresult->fields['id'];
-                               $status[$i]['name']                             
= $dbresult->fields['id'] . ' [' . stripslashes($dbresult->fields['descr']) 
.']';
-                               $i++;
-                               $dbresult->MoveNext();
-                       }
-                       return $status;
-               }
-
-
                function get_owner_type_list()
                {
                        $dbresult = $GLOBALS['phpgw']->db->Execute("SELECT 
id,descr FROM fm_owner_category  ORDER BY descr ");
@@ -186,8 +169,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']:'');
 
@@ -335,25 +316,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);
                                }
@@ -513,28 +475,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";
 //     echo $sql;