[Phpgroupware-cvs] property/inc class.botts.inc.php class.sotts.in...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   07/04/24 08:04:10

Modified files:
        inc            : class.botts.inc.php class.sotts.inc.php 

Log message:
        fix sorting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.botts.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.sotts.inc.php?cvsroot=phpgroupware&r1=1.23&r2=1.24

Patches:
Index: class.botts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.botts.inc.php 16 Mar 2007 08:57:05 -0000      1.32
+++ class.botts.inc.php 24 Apr 2007 08:04:10 -0000      1.33
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.botts.inc.php,v 1.32 2007/03/16 08:57:05 sigurdne 
Exp $
+       * @version $Id: class.botts.inc.php,v 1.33 2007/04/24 08:04:10 sigurdne 
Exp $
        */
 
        /**
@@ -119,11 +119,11 @@
                        {
                                $this->user_filter = $user_filter;
                        }
-                       if(array_key_exists('sort',$_POST))
+                       if(array_key_exists('sort',$_POST) || 
array_key_exists('sort',$_GET))
                        {
                                $this->sort = $sort;
                        }
-                       if(array_key_exists('order',$_POST))
+                       if(array_key_exists('order',$_POST) || 
array_key_exists('order',$_GET))
                        {
                                $this->order = $order;
                        }

Index: class.sotts.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.sotts.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- class.sotts.inc.php 20 Feb 2007 22:22:20 -0000      1.23
+++ class.sotts.inc.php 24 Apr 2007 08:04:10 -0000      1.24
@@ -24,7 +24,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage helpdesk
-       * @version $Id: class.sotts.inc.php,v 1.23 2007/02/20 22:22:20 sigurdne 
Exp $
+       * @version $Id: class.sotts.inc.php,v 1.24 2007/04/24 08:04:10 sigurdne 
Exp $
        */
 
        /**
@@ -34,7 +34,6 @@
 
        class property_sotts
        {
-
                function property_sotts()
                {
                        $this->currentapp       = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
@@ -59,39 +58,22 @@
 
                function read($data)
                {
-
                        if(is_array($data))
                        {
-                               if ($data['start'])
-                               {
-                                       $start=$data['start'];
-                               }
-                               else
-                               {
-                                       $start=0;
-                               }
-                               if ($data['filter'])
-                               {
-                                       $filter=$data['filter'];
-                               }
-                               else
-                               {
-                                       $filter='open';
-                               }
-               //              $filter = 
(isset($data['filter'])?$data['filter']:'open');
+                               $start  = (isset($data['start']) && 
$data['start'] ? $data['start']:0);
+                               $filter = (isset($data['filter']) && 
$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');
+                               $sort = (isset($data['sort']) && $data['sort'] 
? $data['sort']:'DESC');
                                $order = 
(isset($data['order'])?$data['order']:'');
-                               $cat_id = 
(isset($data['cat_id'])?$data['cat_id']:0);
-                               $district_id = 
(isset($data['district_id'])?$data['district_id']:0);
+                               $cat_id = (isset($data['cat_id']) && 
$data['cat_id'] ? $data['cat_id']:0);
+                               $district_id = (isset($data['district_id']) && 
$data['district_id'] ? $data['district_id']:0);
                                $allrows = 
(isset($data['allrows'])?$data['allrows']:'');
                                $start_date = 
(isset($data['start_date'])?$data['start_date']:'');
                                $end_date = 
(isset($data['end_date'])?$data['end_date']:'');
                                $external = 
(isset($data['external'])?$data['external']:'');
                        }
 
-
                        $this->grants   = 
$GLOBALS['phpgw']->session->appsession('grants_ticket',$this->currentapp);
 
                        if(!$this->grants)