[Phpgroupware-cvs] admin/inc class.uiaccounts.inc.php, 1.23.2.9.2.34

[skwashd]

Update of admin/inc

Modified Files:
     Branch: Version-0_9_16-branch
            class.uiaccounts.inc.php lines: +15 -23

Log Message:
fix paging

====================================================
Index: admin/inc/class.uiaccounts.inc.php
diff -u admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.33 
admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.34
--- admin/inc/class.uiaccounts.inc.php:1.23.2.9.2.33    Wed Sep 28 13:29:48 2005
+++ admin/inc/class.uiaccounts.inc.php  Sun Nov 20 23:16:23 2005
@@ -182,36 +182,28 @@
                                $cd = $param_cd;
                        }

-                       if(isset($_POST['query']))
+                       $query = '';
+                       if( isset($_REQUEST['query']) && $_REQUEST['query'])
                        {
-                               $GLOBALS['query'] = $_POST['query'];
+                               $query = $_REQUEST['query'];
                        }

-                       if(isset($_POST['start']))
+                       $start = 0;
+                       if( isset($_REQUEST['start']) && $_REQUEST['start'] )
                        {
-                               $start = intval($_POST['start']);
-                       }
-                       else
-                       {
-                               $start = 0;
+                               $start = intval($_REQUEST['start']);
                        }

-                       if(isset($_GET['order']))
+                       $order = 'account_lid';
+                       if( isset($_REQUEST['order']) && $_REQUEST['order'])
                        {
-                               $order = $_GET['order'];
-                       }
-                       else
-                       {
-                               $order = 'account_lid';
+                               $order = $_REQUEST['order'];
                        }

-                       if(isset($_GET['sort']))
-                       {
-                               $sort = $_GET['sort'];
-                       }
-                       else
+                       $sort = 'ASC';
+                       if( isset($_REQUEST['sort']) && $_REQUEST['sort'] )
                        {
-                               $sort = 'ASC';
+                               $sort = $_REQUEST['sort'];
                        }

                        unset($GLOBALS['phpgw_info']['flags']['noheader']);
@@ -231,12 +223,12 @@

                        if 
($GLOBALS['phpgw']->acl->check('account_access',2,'admin'))
                        {
-                               $account_info = 
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query']);
+                               $account_info = 
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$query);
                                $total = $GLOBALS['phpgw']->accounts->total;
                        }
                        else
                        {
-                               $account_info = 
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$GLOBALS['query']);
+                               $account_info = 
$GLOBALS['phpgw']->accounts->get_list('accounts',$start,$sort,$order,$query);
                                $total = $GLOBALS['phpgw']->accounts->total;
                        }