Changeset 218

Timestamp:

Dec 17, 2006 10:27:56 AM (17 years ago)

Author:

quinn

Message:

Q - ALC class: added a cache->delete() when modifying grants.

Location:

trunk/lib

Files:

• ACL.inc.php (modified) (2 diffs)
• Cache.inc.php (modified) (3 diffs)

trunk/lib/ACL.inc.php

@@ -508 +508 @@
         $axo = is_null($axo) ? 'root' : $axo;
         
+        // Flush old cached values.
+        $cache_hash = $aro . '|' . $aco . '|' . $axo;
+        $this->cache->delete($cache_hash);
+
         // Ensure values exist.
         $qid = $db->query("SELECT aro_tbl.aro_id FROM aro_tbl WHERE aro_tbl.name = '" . $db->escapeString($aro) . "'");
@@ -579 +583 @@
         $where[] = is_null($aco) ? "aco_tbl.name IS NOT NULL" : "aco_tbl.name = '" . $db->escapeString($aco) . "' ";
         $where[] = is_null($axo) ? "axo_tbl.name IS NOT NULL" : "axo_tbl.name = '" . $db->escapeString($axo) . "' ";
+
+        // If any access objects are null, assume using root values.
+        // However if they're empty we don't want to escalate the grant command to root!
+        $aro = is_null($aro) ? 'root' : $aro;
+        $aco = is_null($aco) ? 'root' : $aco;
+        $axo = is_null($axo) ? 'root' : $axo;
+        
+        // Flush old cached values.
+        $cache_hash = $aro . '|' . $aco . '|' . $axo;
+        $this->cache->delete($cache_hash);
 
         $final_where = join(' AND ', $where);

trunk/lib/Cache.inc.php

@@ -186 +186 @@
         }
 
-        if (isset($_SESSION['_cache'][$this->_ns][$key])) {
+        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             $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?
@@ -204 +204 @@
      *
      * @param string $key  The key of the object to check.
-     * @return bool           The return from isset().
+     * @return bool         True if a value exists for the given key.
      */
     function exists($key)
@@ -219 +219 @@
      *
      * @param string $key  The key of the object to check.
-     * @return bool           The return from isset().
+     * @return bool         True if the value existed before being unset.
      */
     function delete($key)
     {
-        unset($_SESSION['_cache'][$this->_ns][$key]);
+        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
+            unset($_SESSION['_cache'][$this->_ns][$key]);
+            return true;
+        } else {
+            return false;
+        }
     }