Changeset 149 for trunk/lib/Prefs.inc.php

Timestamp:

Jun 5, 2006 2:34:47 AM (18 years ago)

Author:

scdev

Message:

Q - while we're changing interfaces I'm going to change ->clearAuth() to ->clear().

File:

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

trunk/lib/Prefs.inc.php

@@ -18 +18 @@
     var $_params = array(
         
+        // The current user_id for which to load/save preferences.
+        'user_id' => null,
+        
+        // How long before we force a reload of the prefs data? 3600 = once every hour.
+        'load_timeout' => 3600,
+        
         // Enable database storage.
         'enable_db' => true,
@@ -26 +32 @@
         // Automatically create table and verify columns. Better set to false after site launch.
         'create_table' => true,
-        
-        // The current user_id for which to load/save preferences.
-        'user_id' => null,
     );
 
@@ -132 +135 @@
     function setDefaults($defaults)
     {
+        $app =& App::getInstance();
         if (isset($defaults) && is_array($defaults)) {
             // Apply defaults to the session, setting only non-existing values.
+            $app->logMsg(sprintf('Pre-defaulting: %s', getDump($_SESSION[$this->_ns]['data'])), LOG_DEBUG, __FILE__, __LINE__);
             $_SESSION[$this->_ns]['data'] = array_merge($defaults, $_SESSION[$this->_ns]['data']);
+            $app->logMsg(sprintf('Post-defaulting: %s', getDump($_SESSION[$this->_ns]['data'])), LOG_DEBUG, __FILE__, __LINE__);
         }
     }
@@ -146 +152 @@
     function set($key, $val)
     {
-        $_SESSION[$this->_ns]['data'][$key] = $val;
+        if ('' != $key && '' != $val) {
+            $_SESSION[$this->_ns]['data'][$key] = $val;
+        }
     }
 
@@ -185 +193 @@
 
     /**
-     * Empty the $_SESSION cache.
+     * Empty the $_SESSION cache. This should be executed with the same consideration as $auth->clear()
      */
     function clear()
@@ -238 +246 @@
         // Data loaded only once per session.
         $_SESSION[$this->_ns]['loaded'] = true;
+        $_SESSION[$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
         
         return true;
@@ -243 +252 @@
     
     /*
-    *   Returns true if the prefs had been loaded from the database into the $_SESSION.
+    * Returns true if the prefs had been loaded from the database into the $_SESSION recently.
+    * This function is simply a check so the database isn't access every page load.
     * 
     * @access   private
@@ -253 +263 @@
     function _isLoaded()
     {
-        return isset($_SESSION[$this->_ns]['loaded']) && true === $_SESSION[$this->_ns]['loaded'];
+        if (isset($_SESSION[$this->_ns]['load_datetime'])
+        && strtotime($_SESSION[$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
+        && isset($_SESSION[$this->_ns]['loaded']) 
+        && true === $_SESSION[$this->_ns]['loaded']) {
+            return true;
+        } else {
+            return false;
+        }
     }
     
@@ -294 +311 @@
             $insert_values = array();
             foreach ($_SESSION[$this->_ns]['data'] as $key => $val) {
-                $insert_values[] = sprintf("('%s', '%s', '%s', '%s')", DB::escapeString($this->getParam('user_id')), DB::escapeString($this->_ns), DB::escapeString($key), DB::escapeString($val));
+                if ('' != trim($key) && '' != trim($val)) {
+                    $insert_values[] = sprintf("('%s', '%s', '%s', '%s')", $db->escapeString($this->getParam('user_id')), $db->escapeString($this->_ns), $db->escapeString($key), $db->escapeString($val));
+                }
             }
             $db->query("