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

Timestamp:

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

Author:

scdev

Message:

${1}

File:

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

trunk/lib/Cache.inc.php

@@ -47 +47 @@
     function Cache($namespace='')
     {
-        $this->_ns = '_cache' . $namespace;
-        
-        if (!isset($_SESSION[$this->_ns])) {
+        $this->_ns = $namespace;
+        
+        if (!isset($_SESSION['_cache'][$this->_ns])) {
             $this->clear();
         }
@@ -146 +146 @@
 
         // Remove any value already stored under this key.
-        unset($_SESSION[$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
 
         // Continue to prune the cache if its size is greater than stack_size_limit, but keep at least min_items.
-        while (strlen(serialize($_SESSION[$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION[$this->_ns]) >= $this->getParam('min_items')) {
-            array_shift($_SESSION[$this->_ns]);
+        while (strlen(serialize($_SESSION['_cache'][$this->_ns])) + $var_len >= $this->getParam('stack_size_limit') && sizeof($_SESSION['_cache'][$this->_ns]) >= $this->getParam('min_items')) {
+            array_shift($_SESSION['_cache'][$this->_ns]);
         }
 
         // Save this value under the specified key.
-        $_SESSION[$this->_ns][$keyhash] =& $var;
+        $_SESSION['_cache'][$this->_ns][$keyhash] =& $var;
 
         if ($var_len >= 1024000) {
@@ -182 +182 @@
 
         $keyhash = md5($key);
-        if (isset($_SESSION[$this->_ns][$keyhash])) {
+        if (isset($_SESSION['_cache'][$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][$keyhash];
-            unset($_SESSION[$this->_ns][$keyhash]);
-            $_SESSION[$this->_ns][$keyhash] =& $tmp;
+            $tmp =& $_SESSION['_cache'][$this->_ns][$keyhash];
+            unset($_SESSION['_cache'][$this->_ns][$keyhash]);
+            $_SESSION['_cache'][$this->_ns][$keyhash] =& $tmp;
             // Return the unserialized datum.
-            return unserialize($_SESSION[$this->_ns][$keyhash]);
+            return unserialize($_SESSION['_cache'][$this->_ns][$keyhash]);
         } else {
             return false;
@@ -208 +208 @@
 
         $keyhash = md5($key);
-        return array_key_exists($keyhash, $_SESSION[$this->_ns]);
+        return array_key_exists($keyhash, $_SESSION['_cache'][$this->_ns]);
     }
 
@@ -220 +220 @@
     {
         $keyhash = md5($key);
-        unset($_SESSION[$this->_ns][$keyhash]);
+        unset($_SESSION['_cache'][$this->_ns][$keyhash]);
     }
     
@@ -233 +233 @@
     function clear()
     {
-        $_SESSION[$this->_ns] = array();
+        $_SESSION['_cache'][$this->_ns] = array();
     }