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

Timestamp:

Apr 4, 2007 4:54:25 AM (17 years ago)

Author:

quinn

Message:

Q - Fixed a few non-fatal but still annoying bugs.

File:

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

trunk/lib/Prefs.inc.php

@@ -204 +204 @@
         $app =& App::getInstance();
         if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
+            $app->logMsg(sprintf('Found %s in persistent', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
         } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
+            $app->logMsg(sprintf('Found %s in defaults', $key), LOG_DEBUG, __FILE__, __LINE__);
             return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];
         } else {
@@ -238 +240 @@
      * as $auth->clear(), such as when logging out.
      */
-    function clear()
-    {
-        $_SESSION['_prefs'][$this->_ns] = array(
-            'loaded' => false,
-            'load_datetime' => '1970-01-01',
-            'defaults' => array(),
-            'persistent' => array(),
-        );
+    function clear($focus='all')
+    {
+        switch ($focus) {
+        case 'all' :
+            $_SESSION['_prefs'][$this->_ns] = array(
+                'loaded' => false,
+                'load_datetime' => '1970-01-01',
+                'defaults' => array(),
+                'persistent' => array(),
+            );
+            break;
+
+        case 'defaults' :
+            $_SESSION['_prefs'][$this->_ns]['defaults'] = array();
+            break;
+
+        case 'persistent' :
+            $_SESSION['_prefs'][$this->_ns]['persistent'] = array();
+            break;
+        }
     }
     
@@ -282 +296 @@
         
         // Clear existing cache.
-        $this->clear();
+        $this->clear('persistent');
         
         // Retrieve all prefs for this user and namespace.
@@ -296 +310 @@
         }
         
-        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION['_prefs'][$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Loaded %s prefs from database.', mysql_num_rows($qid)), LOG_DEBUG, __FILE__, __LINE__);
         
         // Data loaded only once per session.