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

Timestamp:

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

Author:

scdev

Message:

${1}

File:

• trunk/lib/Auth_SQL.inc.php (modified) (9 diffs)

trunk/lib/Auth_SQL.inc.php

@@ -100 +100 @@
         $app =& App::getInstance();
         
-        $this->_ns = '_auth_' . $namespace;
+        $this->_ns = $namespace;
 
         // Initialize default parameters.
@@ -264 +264 @@
             WHERE " . $this->_params['db_primary_key'] . " = '" . $this->get('user_id') . "'
         ");
-        $_SESSION[$this->_ns] = array('authenticated' => false);
+        $_SESSION['_auth_sql'][$this->_ns] = array('authenticated' => false);
     }
 
@@ -276 +276 @@
     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_sql'][$this->_ns]['user_data'])) {
+            $_SESSION['_auth_sql'][$this->_ns]['user_data'] = array();
+        }
+        $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key] = $val;
     }
 
@@ -292 +292 @@
     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_sql'][$this->_ns][$key])) {
+            return $_SESSION['_auth_sql'][$this->_ns][$key];
+        } else if (isset($_SESSION['_auth_sql'][$this->_ns]['user_data'][$key])) {
+            return $_SESSION['_auth_sql'][$this->_ns]['user_data'][$key];
         } else {
             return $default;
@@ -373 +373 @@
 
         // Register authenticated session.
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_auth_sql'][$this->_ns] = array(
             'authenticated'         => true,
             'user_id'               => $user_data['user_id'],
@@ -497 +497 @@
 
         // User login test need only be run once per script execution. We cache the result in the session.
-        if ($this->_authentication_tested && isset($_SESSION[$this->_ns]['authenticated'])) {
-            return $_SESSION[$this->_ns]['authenticated'];
+        if ($this->_authentication_tested && isset($_SESSION['_auth_sql'][$this->_ns]['authenticated'])) {
+            return $_SESSION['_auth_sql'][$this->_ns]['authenticated'];
         }
 
@@ -521 +521 @@
 
         // 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_sql'][$this->_ns])
+            && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']
+            && !empty($_SESSION['_auth_sql'][$this->_ns]['username'])
+            && strtotime($_SESSION['_auth_sql'][$this->_ns]['login_datetime']) > time() - $this->_params['login_timeout']
+            && strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - $this->_params['idle_timeout']
+            && ($_SESSION['_auth_sql'][$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_sql'][$this->_ns]['last_access_datetime'] = date('Y-m-d H:i:s');
 
             // Update the DB with the last_access_datetime and increment the seconds_online.
@@ -544 +544 @@
                 $app->logMsg(sprintf('User update failed. Record not found for user %s (%s).', $this->get('user_id'), $this->get('username')), LOG_NOTICE, __FILE__, __LINE__);
             }
-        } else if (isset($_SESSION[$this->_ns]) && true === $_SESSION[$this->_ns]['authenticated']) {
+        } else if (isset($_SESSION['_auth_sql'][$this->_ns]) && true === $_SESSION['_auth_sql'][$this->_ns]['authenticated']) {
             // User is authenticated, but login has expired.
-            if (strtotime($_SESSION[$this->_ns]['last_access_datetime']) > time() - 43200) {
+            if (strtotime($_SESSION['_auth_sql'][$this->_ns]['last_access_datetime']) > time() - 43200) {
                 // Only raise message if last session is less than 12 hours old.
                 $app->raiseMsg(_("Your session has expired. You need to log-in again."), MSG_NOTICE, __FILE__, __LINE__);
@@ -553 +553 @@
             // Log the reason for login expiration.
             $expire_reasons = array();
-            if (empty($_SESSION[$this->_ns]['username'])) {
+            if (empty($_SESSION['_auth_sql'][$this->_ns]['username'])) {
                 $expire_reasons[] = 'username not found';
             }
-            if (strtotime($_SESSION[$this->_ns]['login_datetime']) <= time() - $this->_params['login_timeout']) {
+            if (strtotime($_SESSION['_auth_sql'][$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_sql'][$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());
+            if ($_SESSION['_auth_sql'][$this->_ns]['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
+                $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION['_auth_sql'][$this->_ns]['remote_ip'], getRemoteAddr());
             }
             $app->logMsg(sprintf('User %s (%s) session expired: %s', $this->get('user_id'), $this->get('username'), join(', ', $expire_reasons)), LOG_INFO, __FILE__, __LINE__);