[Phpgroupware-cvs] admin/inc class.uicurrentsessions.inc.php,1.11

[fipsfuchs]

Update of admin/inc

Modified Files:
     Branch: MAIN
            class.uicurrentsessions.inc.php lines: +27 -16

Log Message:
patch 3955
session list reviewed

====================================================
Index: admin/inc/class.uicurrentsessions.inc.php
diff -u admin/inc/class.uicurrentsessions.inc.php:1.10 
admin/inc/class.uicurrentsessions.inc.php:1.11
--- admin/inc/class.uicurrentsessions.inc.php:1.10      Wed May 11 07:23:06 2005
+++ admin/inc/class.uicurrentsessions.inc.php   Thu May 12 17:58:58 2005
@@ -59,26 +59,35 @@
                                $this->store_location($info);
                        }

-                       if ($GLOBALS['start'] || $GLOBALS['sort'] || 
$GLOBALS['order'])
+                       if(isset($_POST['start']))
                        {
-                               if ($GLOBALS['start'] == 0 || $GLOBALS['start'] 
&& $GLOBALS['start'] != $info['start'])
-                               {
-                                       $info['start'] = $GLOBALS['start'];
-                               }
-
-                               if ($GLOBALS['sort'] && $GLOBALS['sort'] != 
$info['sort'])
-                               {
-                                       $info['sort'] = $GLOBALS['sort'];
-                               }
+                               $info['start'] = intval($_POST['start']);
+                       }
+                       else
+                       {
+                               $start = 0;
+                       }

-                               if ($GLOBALS['order'] && $GLOBALS['order'] != 
$info['order'])
-                               {
-                                       $info['order'] = $GLOBALS['order'];
-                               }
+                       if(isset($_GET['order']))
+                       {
+                               $info['order'] = $_GET['order'];
+                       }
+                       else
+                       {
+                               $order = 'session_dla';
+                       }

-                               $this->store_location($info);
+                       if(isset($_GET['sort']))
+                       {
+                               $info['sort'] = $_GET['sort'];
+                       }
+                       else
+                       {
+                               $sort = 'ASC';
                        }

+                       $this->store_location($info);
+
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Admin').' - '.lang('List of current users');
                        $this->header();

@@ -111,6 +120,8 @@

                        $values = 
$this->bo->list_sessions($info['start'],$info['order'],$info['sort']);

+                       $this->template->set_var('lang_sessions',lang('%1 - %2 
of %3 sessions',$info['start']+1,$start+count($values),$total));
+
                        while (list(,$value) = @each($values))
                        {
                                
$this->nextmatchs->template_alternate_row_color($this->template);