Changeset 172 for trunk/lib/ACL.inc.php

Timestamp:

Jun 15, 2006 7:59:45 PM (18 years ago)

Author:

scdev

Message:

Q - added caching to ACL, and flush command to acl.cli.php

File:

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

trunk/lib/ACL.inc.php

@@ -12 +12 @@
 */
 
+require_once dirname(__FILE__) . '/Cache.inc.php';
+
 class ACL {
 
     // Configuration parameters for this object.
     var $_params = array(
+        
+        // If false nothing will be cached or retreived. Useful for testing realtime data requests.
+        'enable_cache' => true,
 
         // Automatically create table and verify columns. Better set to false after site launch.
@@ -27 +32 @@
     {
         $app =& App::getInstance();
+
+        // Configure the cache object.
+        $this->cache = new Cache('acl');
+        $this->cache->setParam(array('enabled' => true));
 
         // Get create tables config from global context.
@@ -170 +179 @@
         }
         $_db_tested = true;
+        return true;
     }
 
@@ -219 +229 @@
         $qid = $db->query("SELECT 1 FROM $tbl WHERE name = '" . $db->escapeString($name) . "'");
         if (mysql_num_rows($qid) > 0) {
-            $app->logMsg(sprintf('Cannot add %s node, name exists: %s', $type, $name), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot add %s node, already exists: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -299 +309 @@
         $qid = $db->query("SELECT lft, rgt FROM $tbl WHERE name = '" . $db->escapeString($name) . "'");
         if (!list($lft, $rgt) = mysql_fetch_row($qid)) {
-            $app->logMsg(sprintf('Cannot delete nonexistant %s name: %s', $type, $name), LOG_WARNING, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Cannot delete nonexistant %s name: %s', $type, $name), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -412 +422 @@
         $aco = is_null($aco) ? 'root' : $aco;
         $axo = is_null($axo) ? 'root' : $axo;
-
-        $qid = $db->query("
-            SELECT acl_tbl.access
-            FROM acl_tbl
-            LEFT JOIN aro_tbl ON (acl_tbl.aro_id = aro_tbl.aro_id)
-            LEFT JOIN aco_tbl ON (acl_tbl.aco_id = aco_tbl.aco_id)
-            LEFT JOIN axo_tbl ON (acl_tbl.axo_id = axo_tbl.axo_id)
-            WHERE aro_tbl.lft <= (SELECT lft FROM aro_tbl WHERE name = '" . $db->escapeString($aro) . "')
-            AND aco_tbl.lft <= (SELECT lft FROM aco_tbl WHERE name = '" . $db->escapeString($aco) . "')
-            AND axo_tbl.lft <= (SELECT lft FROM axo_tbl WHERE name = '" . $db->escapeString($axo) . "')
-            ORDER BY aro_tbl.aro_id DESC, aco_tbl.aco_id DESC, axo_tbl.axo_id DESC
-            LIMIT 1
-        ");
-        if (!list($access) = mysql_fetch_row($qid)) {
-            $app->logMsg(sprintf('Access denyed: %s -> %s -> %s. No records found.', $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
-            return false;
+        
+        $cache_hash = $aro . '|' . $aco . '|' . $axo;
+        if ($this->cache->exists($cache_hash) && true === $this->getParam('enable_cache')) {
+            // Access value is cached.
+            $access = $this->cache->get($cache_hash);
+        } else {
+            // Retreive access value from db.
+            $qid = $db->query("
+                SELECT acl_tbl.access
+                FROM acl_tbl
+                LEFT JOIN aro_tbl ON (acl_tbl.aro_id = aro_tbl.aro_id)
+                LEFT JOIN aco_tbl ON (acl_tbl.aco_id = aco_tbl.aco_id)
+                LEFT JOIN axo_tbl ON (acl_tbl.axo_id = axo_tbl.axo_id)
+                WHERE aro_tbl.lft <= (SELECT lft FROM aro_tbl WHERE name = '" . $db->escapeString($aro) . "')
+                AND aco_tbl.lft <= (SELECT lft FROM aco_tbl WHERE name = '" . $db->escapeString($aco) . "')
+                AND axo_tbl.lft <= (SELECT lft FROM axo_tbl WHERE name = '" . $db->escapeString($axo) . "')
+                ORDER BY aro_tbl.aro_id DESC, aco_tbl.aco_id DESC, axo_tbl.axo_id DESC
+                LIMIT 1
+            ");
+            if (!list($access) = mysql_fetch_row($qid)) {
+                $app->logMsg(sprintf('Access denyed: %s -> %s -> %s. No records found.', $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
+                return false;
+            }
+            $this->cache->set($cache_hash, $access);
         }