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

Timestamp:

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

Author:

scdev

Message:

${1}

File:

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

trunk/lib/Prefs.inc.php

@@ -63 +63 @@
         $app =& App::getInstance();
 
-        $this->_ns = '_prefs_' . $namespace;
+        $this->_ns = $namespace;
         
         // Initialized the prefs array.
-        if (!isset($_SESSION[$this->_ns])) {
+        if (!isset($_SESSION['_prefs'][$this->_ns])) {
             $this->clear();
         }
@@ -158 +158 @@
     {
         if (isset($defaults) && is_array($defaults)) {
-            $_SESSION[$this->_ns]['defaults'] = array_merge($_SESSION[$this->_ns]['defaults'], $defaults);
+            $_SESSION['_prefs'][$this->_ns]['defaults'] = array_merge($_SESSION['_prefs'][$this->_ns]['defaults'], $defaults);
         }
     }
@@ -180 +180 @@
         }
         
-        if (!isset($_SESSION[$this->_ns]['defaults'][$key]) || $_SESSION[$this->_ns]['defaults'][$key] != $val || isset($_SESSION[$this->_ns]['persistent'][$key])) {
-            $_SESSION[$this->_ns]['persistent'][$key] = $val;            
+        if (!isset($_SESSION['_prefs'][$this->_ns]['defaults'][$key]) || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val || isset($_SESSION['_prefs'][$this->_ns]['persistent'][$key])) {
+            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;            
         }
     }
@@ -196 +196 @@
     {
         $app =& App::getInstance();
-        if (array_key_exists($key, $_SESSION[$this->_ns]['persistent'])) {
-            return $_SESSION[$this->_ns]['persistent'][$key];
-        } else if (array_key_exists($key, $_SESSION[$this->_ns]['defaults'])) {
-            return $_SESSION[$this->_ns]['defaults'][$key];
+        if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent'])) {
+            return $_SESSION['_prefs'][$this->_ns]['persistent'][$key];
+        } else if (array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])) {
+            return $_SESSION['_prefs'][$this->_ns]['defaults'][$key];
         } else {
-            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Key not found in prefs cache: %s', $key), LOG_DEBUG, __FILE__, __LINE__);
             return null;
         }
@@ -214 +214 @@
     function exists($key)
     {
-        return array_key_exists($key, $_SESSION[$this->_ns]['persistent']);
+        return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['persistent']);
     }
 
@@ -224 +224 @@
     function delete($key)
     {
-        unset($_SESSION[$this->_ns]['persistent'][$key]);
+        unset($_SESSION['_prefs'][$this->_ns]['persistent'][$key]);
     }
 
@@ -233 +233 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array(
+        $_SESSION['_prefs'][$this->_ns] = array(
             'loaded' => false,
             'load_datetime' => '1970-01-01',
@@ -286 +286 @@
         ");
         while (list($key, $val) = mysql_fetch_row($qid)) {
-            $_SESSION[$this->_ns]['persistent'][$key] = $val;
+            $_SESSION['_prefs'][$this->_ns]['persistent'][$key] = $val;
         }
         
-        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION[$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
+        $app->logMsg(sprintf('Loaded %s prefs from database.', sizeof($_SESSION['_prefs'][$this->_ns]['persistent'])), LOG_DEBUG, __FILE__, __LINE__);
         
         // Data loaded only once per session.
-        $_SESSION[$this->_ns]['loaded'] = true;
-        $_SESSION[$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
+        $_SESSION['_prefs'][$this->_ns]['loaded'] = true;
+        $_SESSION['_prefs'][$this->_ns]['load_datetime'] = date('Y-m-d H:i:s');
         
         return true;
@@ -310 +310 @@
     function _isLoaded()
     {
-        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']) {
+        if (isset($_SESSION['_prefs'][$this->_ns]['load_datetime'])
+        && strtotime($_SESSION['_prefs'][$this->_ns]['load_datetime']) > time() - $this->getParam('load_timeout')
+        && isset($_SESSION['_prefs'][$this->_ns]['loaded']) 
+        && true === $_SESSION['_prefs'][$this->_ns]['loaded']) {
             return true;
         } else {
@@ -347 +347 @@
         $this->initDB();
 
-        if (isset($_SESSION[$this->_ns]['persistent']) && is_array($_SESSION[$this->_ns]['persistent'])) {
+        if (isset($_SESSION['_prefs'][$this->_ns]['persistent']) && is_array($_SESSION['_prefs'][$this->_ns]['persistent'])) {
             // Delete old prefs from database.
             $db->query("
@@ -357 +357 @@
             // Insert new prefs.
             $insert_values = array();
-            foreach ($_SESSION[$this->_ns]['persistent'] as $key => $val) {
+            foreach ($_SESSION['_prefs'][$this->_ns]['persistent'] 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));
             }