[Phpgroupware-cvs] api/sessions/class.sessions_php.php, 1.1.1.1.2.12

[nomail]

Update of /api/sessions
Modified Files:
        Branch: proposal-branch
          class.sessions_php.php

date: 2004/05/01 00:02:01;  author: jengo;  state: Exp;  lines: +12 -9

Log Message:
Fixed view current users and view session data
=====================================================================
Index: api/sessions/class.sessions_php.php
diff -u api/sessions/class.sessions_php.php:1.1.1.1.2.11 
api/sessions/class.sessions_php.php:1.1.1.1.2.12
--- api/sessions/class.sessions_php.php:1.1.1.1.2.11    Fri Apr 16 20:59:49 2004
+++ api/sessions/class.sessions_php.php Sat May  1 00:02:01 2004
@@ -194,7 +194,7 @@
                        $args = $args->get(func_get_args());
 
                        $i = 0;
-                       if (!$dh = opendir(get_cfg_var('session.save_path')))
+                       if (! $dh = opendir(get_cfg_var('session.save_path')))
                        {
                                return FALSE;
                        }
@@ -203,24 +203,26 @@
                        {
                                $args['start'] = 0;
                        }
-                       $stop_point = $args['start'] + 
$_SESSION['phpgw_data']['prefs']['api.maxmatchs'];
+                       $stop_point = $args['start'] + 
$GLOBALS['phpgw_data']['prefs']['api.maxmatchs'];
 
                        $result = array();
                        while ($i < $stop_point)
                        {
-                               if (!$file= readdir($dh))
+                               if (! $file = readdir($dh))
                                {
                                        break;
                                }
-                               
+
                                if 
(preg_match('/^sess_([a-f0-9]{32})$/',$file,$matches))
                                {
                                        $sid = $matches[1];
-                                       if 
(is_array($this->read_other_session($sid)))
+                                       $session_values = 
$this->read_other_session($sid);
+                                       if (is_array($session_values))
                                        {
                                                if ($args['start'] <= $i)
                                                {
-                                                       $result[] = array(
+                                                       $result[] = array
+                                                       (
                                                                'lid'        => 
$session_values['session_lid'],
                                                                'action'     => 
$session_values['prevop'],
                                                                'ip'         => 
$session_values['ip_address'],
@@ -234,6 +236,7 @@
                                }
                        }
                        closedir($dh);
+
                        return $result;
                }
 
@@ -250,7 +253,7 @@
                        }
 
                        $raw_data = '';
-                       while (!feof($fh))
+                       while (! feof($fh))
                        {
                                $raw_data .= fgets($fh,4096);
                        }