[Phpgroupware-cvs] property/inc class.sotts.inc.php, 1.11 class.boentity.inc.php, 1.10

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.sotts.inc.php lines: +11 -4
            class.boentity.inc.php lines: +4 -4

Log Message:
*** empty log message ***

====================================================
Index: property/inc/class.sotts.inc.php
diff -u property/inc/class.sotts.inc.php:1.10 
property/inc/class.sotts.inc.php:1.11
--- property/inc/class.sotts.inc.php:1.10       Fri Sep  9 10:52:13 2005
+++ property/inc/class.sotts.inc.php    Wed Nov  9 10:34:11 2005
@@ -72,7 +72,15 @@
                                {
                                        $start=0;
                                }
-                               $filter = 
(isset($data['filter'])?$data['filter']:'open');
+                               if ($data['filter'])
+                               {
+                                       $filter=$data['filter'];
+                               }
+                               else
+                               {
+                                       $filter='open';
+                               }
+               //              $filter = 
(isset($data['filter'])?$data['filter']:'open');
                                $user_filter= 
(isset($data['user_filter'])?$data['user_filter']:'');
                                $query = 
(isset($data['query'])?$data['query']:'');
                                $sort = 
(isset($data['sort'])?$data['sort']:'DESC');
@@ -84,7 +92,6 @@
                                $end_date = 
(isset($data['end_date'])?$data['end_date']:'');
                        }

-//_debug_array($data);

 /*                     $this->grants   = 
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp);

@@ -126,7 +133,7 @@
                                $filtermethod .= " $where 
fm_tts_tickets.status='X'";
                                $where = 'AND';
                        }
-                       elseif($filter == ''):
+                       elseif($filter == 'open'):
                        {
                                $filtermethod .= " $where 
fm_tts_tickets.status='O'";
                                $where = 'AND';

====================================================
Index: property/inc/class.boentity.inc.php
diff -u property/inc/class.boentity.inc.php:1.9 
property/inc/class.boentity.inc.php:1.10
--- property/inc/class.boentity.inc.php:1.9     Wed Nov  9 08:19:41 2005
+++ property/inc/class.boentity.inc.php Wed Nov  9 10:34:11 2005
@@ -79,7 +79,7 @@
                        $district_id    = 
get_var('district_id',array('POST','GET'));
                        $entity_id      = 
get_var('entity_id',array('POST','GET'));
                        $status = get_var('status',array('POST','GET'));
-
+
                        $this->soadmin_entity           = 
CreateObject($this->currentapp.'.soadmin_entity',$entity_id,$cat_id);
                        $this->category_name    = 
$this->soadmin_entity->category_name;

@@ -108,7 +108,7 @@
                        {
                                $this->order = $order;
                        }
-                       if(array_key_exists('cat_id',$_POST))
+                       if(array_key_exists('cat_id',$_POST) || 
array_key_exists('cat_id',$_GET) )
                        {
                                $this->cat_id = $cat_id;
                        }
@@ -116,7 +116,7 @@
                        {
                                $this->district_id = $district_id;
                        }
-                       if(array_key_exists('entity_id',$_POST))
+                       if(array_key_exists('entity_id',$_POST) || 
array_key_exists('entity_id',$_GET) )
                        {
                                $this->entity_id = $entity_id;
                        }