[Phpgroupware-cvs] property/inc class.uitts.inc.php, 1.22 class.botts.inc.php, 1.11 class.boentity.inc.php, 1.9

[sigurdne]

Update of property/inc

Modified Files:
     Branch: MAIN
            class.uitts.inc.php lines: +1 -2
            class.botts.inc.php lines: +10 -15
            class.boentity.inc.php lines: +9 -9

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

====================================================
Index: property/inc/class.uitts.inc.php
diff -u property/inc/class.uitts.inc.php:1.21 
property/inc/class.uitts.inc.php:1.22
--- property/inc/class.uitts.inc.php:1.21       Tue Nov  8 22:39:10 2005
+++ property/inc/class.uitts.inc.php    Wed Nov  9 08:19:41 2005
@@ -491,7 +491,6 @@

                        $data = array
                        (
-                               'lang_reset_query'                      => 
lang('check to reset the query'),
                                'group_filters'                         => 
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
                                'lang_excel'                            => 
'excel',
                                'link_excel'                            => 
$GLOBALS['phpgw']->link('/index.php',$link_excel),

====================================================
Index: property/inc/class.botts.inc.php
diff -u property/inc/class.botts.inc.php:1.10 
property/inc/class.botts.inc.php:1.11
--- property/inc/class.botts.inc.php:1.10       Tue Nov  8 22:39:10 2005
+++ property/inc/class.botts.inc.php    Wed Nov  9 08:19:41 2005
@@ -65,13 +65,8 @@

                        if ($session)
                        {
-                               $reset_query = 
get_var('reset_query',array('POST','GET'));
-                               if(!$reset_query)
-                               {
-                                       $this->read_sessiondata();
-                               }
+                               $this->read_sessiondata();
                                $this->use_session = True;
-
                        }

                        $start  = get_var('start',array('POST','GET'));
@@ -93,35 +88,35 @@
                                $this->start=0;
                        }

-                       if($query)
+                       if(array_key_exists('query',$_POST))
                        {
                                $this->query = $query;
                        }
-                       if($filter)
+                       if(array_key_exists('filter',$_POST))
                        {
                                $this->filter = $filter;
                        }
-                       if($user_filter)
+                       if(array_key_exists('user_filter',$_POST))
                        {
                                $this->user_filter = $user_filter;
                        }
-                       if($sort)
+                       if(array_key_exists('sort',$_POST))
                        {
                                $this->sort = $sort;
                        }
-                       if($order)
+                       if(array_key_exists('order',$_POST))
                        {
                                $this->order = $order;
                        }
-                       if($cat_id)
+                       if(array_key_exists('cat_id',$_POST))
                        {
                                $this->cat_id = $cat_id;
                        }
-                       if($district_id)
+                       if(array_key_exists('district_id',$_POST))
                        {
                                $this->district_id = $district_id;
                        }
-                       if($allrows)
+                       if(array_key_exists('allrows',$_POST))
                        {
                                $this->allrows = $allrows;
                        }

====================================================
Index: property/inc/class.boentity.inc.php
diff -u property/inc/class.boentity.inc.php:1.8 
property/inc/class.boentity.inc.php:1.9
--- property/inc/class.boentity.inc.php:1.8     Tue Nov  8 22:39:10 2005
+++ property/inc/class.boentity.inc.php Wed Nov  9 08:19:41 2005
@@ -92,35 +92,35 @@
                                $this->start=0;
                        }

-                       if($query)
+                       if(array_key_exists('query',$_POST))
                        {
                                $this->query = $query;
                        }
-                       if($filter)
+                       if(array_key_exists('filter',$_POST))
                        {
                                $this->filter = $filter;
                        }
-                       if($sort)
+                       if(array_key_exists('sort',$_POST))
                        {
                                $this->sort = $sort;
                        }
-                       if($order)
+                       if(array_key_exists('order',$_POST))
                        {
                                $this->order = $order;
                        }
-                       if($cat_id)
+                       if(array_key_exists('cat_id',$_POST))
                        {
                                $this->cat_id = $cat_id;
                        }
-                       if($district_id)
+                       if(array_key_exists('district_id',$_POST))
                        {
                                $this->district_id = $district_id;
                        }
-                       if($entity_id)
+                       if(array_key_exists('entity_id',$_POST))
                        {
                                $this->entity_id = $entity_id;
                        }
-                       if($status)
+                       if(array_key_exists('status',$_POST))
                        {
                                $this->status = $status;
                        }