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

Timestamp:

Jul 27, 2015 7:56:08 AM (9 years ago)

Author:

anonymous

Message:

Improved module maker validation output. Allow disabling cache at run time for ACL. Added ACL getList() method. Improved ACL CLI listing. Fixed app boomerang array initialization. Now retaining identical boomerang URLs if the key is different. Added a maximum boomerang time. Added a way to disable cache per request through a query string. Added validator isDecimal() method. Added disableSelectOptions() HTML method. Added getGravatarURL() method. Change how navigation page array is managed. Updated navigation currentPage() method to test an array of URLs.

File:

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

trunk/lib/ACL.inc.php

@@ -65 +65 @@
         // Configure the cache object.
         $this->cache = new Cache('acl');
-        $this->cache->setParam(array('enabled' => true));
 
         // Get create tables config from global context.
@@ -101 +100 @@
 
         if (isset($params) && is_array($params)) {
+            // Some params require special processing. Catch those in a loop and process individually.
+            foreach ($params as $key => $val) {
+                switch ($key) {
+                case 'enable_cache':
+                    $this->cache->setParam(array('enabled' => $val));
+                    break;
+                }
+
+            }
+            unset($key, $value);
+
             // Merge new parameters with old overriding only those passed.
             $this->_params = array_merge($this->_params, $params);
@@ -675 +685 @@
 
         $cache_hash = $aro . '|' . $aco . '|' . $axo;
-        if ($this->cache->exists($cache_hash) && true === $this->getParam('enable_cache')) {
+        if (true === $this->getParam('enable_cache') && $this->cache->exists($cache_hash)) {
             // Access value is cached.
             $access = $this->cache->get($cache_hash);
@@ -694 +704 @@
             if (!list($access) = mysql_fetch_row($qid)) {
                 $this->cache->set($cache_hash, 'deny');
-                $app->logMsg(sprintf('Access denied: %s -> %s -> %s (no records found).', $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
+                $app->logMsg(sprintf('Access denied: %s -> %s -> %s (no records found).', $aro, $aco, $axo), LOG_WARNING, __FILE__, __LINE__);
                 return false;
             }
@@ -704 +714 @@
             return true;
         } else {
-            $app->logMsg(sprintf('Access denied: %s -> %s -> %s', $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
+            $app->logMsg(sprintf('Access denied: %s -> %s -> %s', $aro, $aco, $axo), LOG_NOTICE, __FILE__, __LINE__);
             return false;
         }
@@ -736 +746 @@
     }
 
+    /*
+    * Returns an array of the specified object type starting specified root.
+    *
+    * @access   public
+    * @param    string $type Table to list, one of: aro, aco, or axo.
+    * @param    string $root Root node from which to begin from.
+    * @return   mixed        Returns a multidimensional array of objects, or false on error.
+    * @author   Quinn Comendant <quinn@strangecode.com>
+    * @version  1.0
+    * @since    17 Jun 2006 23:41:22
+    */
+    function getList($type, $root=null)
+    {
+        $app =& App::getInstance();
+        $db =& DB::getInstance();
+
+        switch ($type) {
+        case 'aro' :
+            $tbl = 'aro_tbl';
+            break;
+        case 'aco' :
+            $tbl = 'aco_tbl';
+            break;
+        case 'axo' :
+            $tbl = 'axo_tbl';
+            break;
+        default :
+            $app->logMsg(sprintf('Invalid access object type: %s', $type), LOG_ERR, __FILE__, __LINE__);
+            return false;
+        }
+
+        // By default start with the 'root' node.
+        $root = !isset($root) ? 'root' : $root;
+
+        // Retrieve the left and right value of the $root node.
+        $qid = $db->query("SELECT lft, rgt FROM $tbl WHERE name = '" . $db->escapeString($root) . "'");
+        list($lft, $rgt) = mysql_fetch_row($qid);
+
+        $results = array();
+        $depth = array();
+
+        // Retrieve all descendants of the root node
+        $qid = $db->query("SELECT name, lft, rgt, added_datetime FROM $tbl WHERE lft BETWEEN $lft AND $rgt ORDER BY lft ASC");
+        while (list($name, $lft, $rgt, $added_datetime) = mysql_fetch_row($qid)) {
+            // If the last element of $depth is less than the current rgt it means we finished with a set of children nodes.
+            while (sizeof($depth) > 0 && end($depth) < $rgt) {
+                array_pop($depth);
+            }
+
+            $results[] = array(
+                'name' => $name,
+                'added_datetime' => $added_datetime,
+                'depth' => sizeof($depth),
+            );
+
+            // Add this node to the stack.
+            $depth[] = $rgt;
+        }
+
+        return $results;
+    }
+
 } // End class.