Changeset 153 for trunk/lib/Cache.inc.php

Timestamp:

Jun 7, 2006 8:41:19 PM (18 years ago)

Author:

scdev

Message:

Q - decided to use standard instantiation for Prefs and Cache instead of singleton methods.

File:

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

trunk/lib/Cache.inc.php

@@ -131 +131 @@
         }
 
-        $key = md5($key);
+        $keyhash = md5($key);
         $var = serialize($var);
         $var_len = strlen($var);
@@ -146 +146 @@
 
         // Remove any value already stored under this key.
-        unset($_SESSION[$this->_ns][$key]);
+        unset($_SESSION[$this->_ns][$keyhash]);
 
         // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
@@ -154 +154 @@
 
         // Save this value under the specified key.
-        $_SESSION[$this->_ns][$key] =& $var;
+        $_SESSION[$this->_ns][$keyhash] =& $var;
 
         if ($var_len >= 1024000) {
@@ -174 +174 @@
     function get($key)
     {
+        $app =& App::getInstance();
+        
         if (true !== $this->getParam('enabled')) {
-            return false;
-        }
-
-        $key = md5($key);
-        if (isset($_SESSION[$this->_ns][$key])) {
+            $app->logMsg(sprintf('Cache not enabled, not getting data.', null), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
+        $keyhash = md5($key);
+        if (isset($_SESSION[$this->_ns][$keyhash])) {
+            $app->logMsg(sprintf('Retreiving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
             // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
-            $tmp =& $_SESSION[$this->_ns][$key];
-            unset($_SESSION[$this->_ns][$key]);
-            $_SESSION[$this->_ns][$key] =& $tmp;
+            $tmp =& $_SESSION[$this->_ns][$keyhash];
+            unset($_SESSION[$this->_ns][$keyhash]);
+            $_SESSION[$this->_ns][$keyhash] =& $tmp;
             // Return the unserialized datum.
-            return unserialize($_SESSION[$this->_ns][$key]);
+            return unserialize($_SESSION[$this->_ns][$keyhash]);
         } else {
             return false;
@@ -203 +207 @@
         }
 
-        $key = md5($key);
-        return array_key_exists($key, $_SESSION[$this->_ns]);
+        $keyhash = md5($key);
+        return array_key_exists($keyhash, $_SESSION[$this->_ns]);
     }
 
@@ -215 +219 @@
     function delete($key)
     {
-        $key = md5($key);
-        unset($_SESSION[$this->_ns][$key]);
+        $keyhash = md5($key);
+        unset($_SESSION[$this->_ns][$keyhash]);
     }