Changeset 154 for trunk/lib/Auth_File.inc.php

Timestamp:

Jun 8, 2006 5:36:10 AM (18 years ago)

Author:

scdev

Message:

${1}

File:

• trunk/lib/Auth_File.inc.php (modified) (8 diffs)

trunk/lib/Auth_File.inc.php

@@ -68 +68 @@
     function Auth_File($namespace='null')
     {
-        $this->_ns = '_auth_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -114 +114 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array('authenticated' => false);
+        $_SESSION['_auth_file'][$this->_ns] = array('authenticated' => false);
     }
 
@@ -127 +127 @@
     function set($key, $val)
     {
-        if (!isset($_SESSION[$this->_ns]['user_data'])) {
-            $_SESSION[$this->_ns]['user_data'] = array();
-        }
-        $_SESSION[$this->_ns]['user_data'][$key] = $val;
+        if (!isset($_SESSION['_auth_file'][$this->_ns]['user_data'])) {
+            $_SESSION['_auth_file'][$this->_ns]['user_data'] = array();
+        }
+        $_SESSION['_auth_file'][$this->_ns]['user_data'][$key] = $val;
     }
 
@@ -143 +143 @@
     function get($key, $default='')
     {
-        if (isset($_SESSION[$this->_ns][$key])) {
-            return $_SESSION[$this->_ns][$key];
-        } else if (isset($_SESSION[$this->_ns]['user_data'][$key])) {
-            return $_SESSION[$this->_ns]['user_data'][$key];
+        if (isset($_SESSION['_auth_file'][$this->_ns][$key])) {
+            return $_SESSION['_auth_file'][$this->_ns][$key];
+        } else if (isset($_SESSION['_auth_file'][$this->_ns]['user_data'][$key])) {
+            return $_SESSION['_auth_file'][$this->_ns]['user_data'][$key];
         } else {
             return $default;
@@ -209 +209 @@
         }
         
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_auth_file'][$this->_ns] = array(
             'authenticated' => true,
             'username' => $username,
@@ -238 +238 @@
         if ($trusted_net = ipInRange(getRemoteAddr(), $this->_params['trusted_networks'])) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION[$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('User %s accessing from trusted network %s', $_SESSION['_auth_file'][$this->_ns]['username'], $trusted_net), LOG_DEBUG, __FILE__, __LINE__);
         } else if (preg_match('/proxy.aol.com$/i', getRemoteAddr(true))) {
             $user_in_trusted_network = true;
-            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION[$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('User %s accessing from trusted network proxy.aol.com', $_SESSION['_auth_file'][$this->_ns]['username']), LOG_DEBUG, __FILE__, __LINE__);
         } else {
             $user_in_trusted_network = false;
@@ -247 +247 @@
 
         // Test login with information stored in session. Skip IP matching for users from trusted networks.
-        if (isset($_SESSION[$this->_ns])
-            && true === $_SESSION[$this->_ns]['authenticated']
-            && !empty($_SESSION[$this->_ns]['username'])
-            && strtotime($_SESSION[$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
-            && strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
-            && ($_SESSION[$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
+        if (isset($_SESSION['_auth_file'][$this->_ns])
+            && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']
+            && !empty($_SESSION['_auth_file'][$this->_ns]['username'])
+            && strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
+            && strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
+            && ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] == getRemoteAddr() || $user_in_trusted_network)
         ) {
             // User is authenticated!
-            $_SESSION[$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
+            $_SESSION['_auth_file'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
             return true;
-        } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
+        } else if (isset($_SESSION['_auth_file'][$this->_ns]) && true === $_SESSION['_auth_file'][$this->_ns]['authenticated']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) > time() - 43200) {
                 // Only raise message if last session is less than 12 hours old.
                 $app->raiseMsg(_("Your session has closed. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
@@ -265 +265 @@
             // Log the reason for login expiration.
             $expire_reasons = array();
-            if (empty($_SESSION[$this->_ns]['username'])) {
+            if (empty($_SESSION['_auth_file'][$this->_ns]['username'])) {
                 $expire_reasons[] = 'username not found';
             }
-            if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
                 $expire_reasons[] = 'login_timeout expired';
             }
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
+            if (strtotime($_SESSION['_auth_file'][$this->_ns]['last_access_datetime']) <= time() - $this->_params['idle_timeout']) {
                 $expire_reasons[] = 'idle_timeout expired';
             }
-            if ($_SESSION[$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
-                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_ns]['remote_ip'], getRemoteAddr());
-            }
-            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION[$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
+            if ($_SESSION['_auth_file'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
+                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_file'][$this->_ns]['remote_ip'], getRemoteAddr());
+            }
+            $app->logMsg(sprintf('User %s session expired: %s', $_SESSION['_auth_file'][$this->_ns]['username'], join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);
         }