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

Timestamp:

Apr 19, 2006 3:14:28 AM (18 years ago)

Author:

scdev

Message:

Q - Cleaned up Auth_File to work more like Auth_SQL, and fixed a few bugs here and there.

File:

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

trunk/lib/Auth_SQL.inc.php

@@ -25 +25 @@
     var $_default_params = array(
 
-        // Message displayed by requireLogin().
-        'login_required_message' => 'Please login',
-
         // Automatically create table and verify columns. Better set to false after site launch.
         'create_table' => true,
@@ -77 +74 @@
         'login_abuse_exempt_usernames' => array(),
 
-        // An array of IP blocks that are bypass the remote_addr comparison check. Useful for dynamic IPs or those behind proxy servers.
+        // An array of IP blocks that are bypass the remote_ip comparison check. Useful for dynamic IPs or those behind proxy servers.
         'trusted_networks' => array(),
 
@@ -209 +206 @@
 
     /**
+     * Set the params of an auth object.
+     *
+     * @param  array $params   Array of parameter keys and value to set.
+     * @return bool true on success, false on failure
+     */
+    function setParam($params)
+    {
+        if (isset($params) && is_array($params)) {
+            // Merge new parameters with old overriding only those passed.
+            $this->_params = array_merge($this->_params, $params);
+        }
+    }
+
+    /**
+     * Return the value of a parameter, if it exists.
+     *
+     * @access public
+     * @param string $param        Which parameter to return.
+     * @return mixed               Configured parameter value.
+     */
+    function getParam($param)
+    {
+        if (isset($this->_params[$param])) {
+            return $this->_params[$param];
+        } else {
+            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
+            return null;
+        }
+    }
+
+    /**
+     * Clear any authentication tokens in the current session. A.K.A. logout.
+     *
+     * @access public
+     */
+    function clearAuth()
+    {
+        $this->initDB();
+
+        DB::query("
+            UPDATE " . $this->_params['db_table'] . " SET
+            seconds_online = seconds_online + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)),
+            last_login_datetime = '0000-00-00 00:00:00'
+            WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'
+        ");
+        $_SESSION['_auth_file'] = array('authenticated' => false);
+    }
+
+    /**
      * Sets a variable into a registered auth session.
      *
@@ -240 +286 @@
             return $default;
         }
-    }
-
-    /**
-     * Set the params of an auth object.
-     *
-     * @param  array $params   Array of parameter keys and value to set.
-     * @return bool true on success, false on failure
-     */
-    function setParam($params)
-    {
-        if (isset($params) && is_array($params)) {
-            // Merge new parameters with old overriding only those passed.
-            $this->_params = array_merge($this->_params, $params);
-        }
-    }
-
-    /**
-     * Return the value of a parameter, if it exists.
-     *
-     * @access public
-     * @param string $param        Which parameter to return.
-     * @return mixed               Configured parameter value.
-     */
-    function getParam($param)
-    {
-        if (isset($this->_params[$param])) {
-            return $this->_params[$param];
-        } else {
-            App::logMsg(sprintf('Parameter is not set: %s', $param), LOG_DEBUG, __FILE__, __LINE__);
-            return null;
-        }
-    }
-
-    /**
-     * Clear any authentication tokens in the current session. A.K.A. logout.
-     *
-     * @access public
-     */
-    function clearAuth()
-    {
-        $this->initDB();
-
-        DB::query("
-            UPDATE " . $this->_params['db_table'] . " SET
-            seconds_online = seconds_online + (UNIX_TIMESTAMP() - UNIX_TIMESTAMP(last_access_datetime)),
-            last_login_datetime = '0000-00-00 00:00:00'
-            WHERE " . $this->_params['db_primary_key'] . " = '" . $this->getVal('user_id') . "'
-        ");
-        $_SESSION[$this->_sess] = array();
-        $_SESSION[$this->_sess]['authenticated'] = false;
     }
 
@@ -532 +528 @@
                 $expire_reasons[] = 'idle_timeout expired';
             }
-            if ($_SESSION[$this->_sess]['remote_ip'] != getRemoteAddr()) {
+            if ($_SESSION['_auth_file']['remote_ip'] != getRemoteAddr() && !$user_in_trusted_network) {
                 $expire_reasons[] = sprintf('remote_ip not matched (%s != %s)', $_SESSION[$this->_sess]['remote_ip'], getRemoteAddr());
             }
@@ -556 +552 @@
     {
         if (!$this->isLoggedIn()) {
-            // Display message for requiring login.
+            // Display message for requiring login. (RaiseMsg will ignore empty strings.)
             App::raiseMsg($message, $type, $file, $line);