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

Timestamp:

Jun 18, 2006 8:50:35 AM (18 years ago)

Author:

scdev

Message:

Q - added move method to ACL class, added polish.

File:

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

trunk/lib/Cache.inc.php

@@ -117 +117 @@
 
     /**
-     * Stores a new variable in the session cache. The $key is is md5'ed
-     * because if a key is numeric, the array_shift function
-     * will reset the key to the next largest int key. Weird behavior I can't
-     * understand. For example $cache["123"] will become $cache[0]
+     * Stores a new variable in the session cache. The $key should not be numberic
+     * because the array_shift function will reset the key to the next largest 
+     * int key. Weird behavior I can't understand. For example $cache["123"] will become $cache[0]
      *
      * @param str   $key        An identifier for the cached object.
@@ -138 +137 @@
         }
 
-        $keyhash = md5($key);
         $var = serialize($var);
         $var_len = strlen($var);
@@ -153 +151 @@
 
         // Remove any value already stored under this key.
-        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$key]);
 
         // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
@@ -161 +159 @@
 
         // Save this value under the specified key.
-        $_SESSION['_cache'][$this->_ns][$keyhash] =& $var;
+        $_SESSION['_cache'][$this->_ns][$key] =& $var;
 
         if ($var_len >= 1024000) {
@@ -188 +186 @@
         }
 
-        $keyhash = md5($key);
-        if (isset($_SESSION['_cache'][$this->_ns][$keyhash])) {
+        if (isset($_SESSION['_cache'][$this->_ns][$key])) {
             $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['_cache'][$this->_ns][$keyhash];
-            unset($_SESSION['_cache'][$this->_ns][$keyhash]);
-            $_SESSION['_cache'][$this->_ns][$keyhash] =& $tmp;
+            $tmp =& $_SESSION['_cache'][$this->_ns][$key];
+            unset($_SESSION['_cache'][$this->_ns][$key]);
+            $_SESSION['_cache'][$this->_ns][$key] =& $tmp;
             // Return the unserialized datum.
-            return unserialize($_SESSION['_cache'][$this->_ns][$keyhash]);
+            return unserialize($_SESSION['_cache'][$this->_ns][$key]);
         } else {
             $app->logMsg(sprintf('Missing %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
@@ -215 +212 @@
         }
 
-        $keyhash = md5($key);
-        return array_key_exists($keyhash, $_SESSION['_cache'][$this->_ns]);
+        return array_key_exists($key, $_SESSION['_cache'][$this->_ns]);
     }
 
@@ -227 +223 @@
     function delete($key)
     {
-        $keyhash = md5($key);
-        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$key]);
     }