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

Timestamp:

Jun 15, 2006 8:29:03 PM (18 years ago)

Author:

scdev

Message:

Q - little bugs fixing in ACL and acl.cli.php.

File:

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

trunk/lib/ACL.inc.php

@@ -4 +4 @@
 * 
 * Uses the ARO/ACO/AXO model of Access Control Lists.
+* Uses Modified Preorder Tree Traversal to maintain a tree-structure.
+* See: http://www.sitepoint.com/print/hierarchical-data-database
 * Includes a command-line tool for managing rights.
 * 
@@ -124 +126 @@
             
             // acl_tbl
-            $db->query("CREATE TABLE IF NOT EXISTS acl_tbl (
+            $db->query("
+                CREATE TABLE IF NOT EXISTS acl_tbl (
                     aro_id SMALLINT(11) UNSIGNED NOT NULL DEFAULT '0',
                     aco_id SMALLINT(11) UNSIGNED NOT NULL DEFAULT '0',
@@ -143 +146 @@
                 $app->logMsg(sprintf('Database table acl_tbl has invalid columns. Please update this table manually.', null), LOG_ALERT, __FILE__, __LINE__);
                 trigger_error(sprintf('Database table acl_tbl has invalid columns. Please update this table manually.', null), E_USER_ERROR);
+            } else {
+                // Insert root node data if nonexistant, dely all by default.
+                $qid = $db->query("SELECT 1 FROM acl_tbl");
+                if (mysql_num_rows($qid) == 0) {
+                    $qid = $db->query("REPLACE INTO acl_tbl VALUES ('1', '1', '1', 'deny', NOW())");                    
+                }                
             }
 
-            // The tuples of objects.
+            // aro_tbl, aco_tbl, axo_tbl
             foreach (array('aro', 'aco', 'axo') as $a_o) {
-                // Each of these uses Modified Preorder Tree Traversal to maintain a tree-structure in a flat format.
-                // See: http://www.sitepoint.com/print/hierarchical-data-database
-                $db->query("CREATE TABLE IF NOT EXISTS {$a_o}_tbl (
+                $db->query("
+                    CREATE TABLE IF NOT EXISTS {$a_o}_tbl (
                         {$a_o}_id SMALLINT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
                         name VARCHAR(32) NOT NULL DEFAULT '',
@@ -155 +163 @@
                         rgt MEDIUMINT(9) UNSIGNED NOT NULL DEFAULT '0',
                         added_datetime DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
-                        UNIQUE name (name),
+                        UNIQUE KEY name (name(15)),
                         KEY transversal (lft, rgt)
                     ) ENGINE=MyISAM;
                 ");
-
-                $qid = $db->query("SELECT 1 FROM {$a_o}_tbl WHERE name = 'root'");
-                if (mysql_num_rows($qid) == 0) {
-                    // Insert root node data.
-                    $qid = $db->query("REPLACE INTO {$a_o}_tbl (name, lft, rgt, added_datetime) VALUES ('root', 1, 2, NOW())");                    
-                }
 
                 if (!$db->columnExists("{$a_o}_tbl", array(
@@ -175 +177 @@
                     $app->logMsg(sprintf('Database table %s has invalid columns. Please update this table manually.', "{$a_o}_tbl"), LOG_ALERT, __FILE__, __LINE__);
                     trigger_error(sprintf('Database table %s has invalid columns. Please update this table manually.', "{$a_o}_tbl"), E_USER_ERROR);
+                } else {
+                    // Insert root node data if nonexistant.
+                    $qid = $db->query("SELECT 1 FROM {$a_o}_tbl WHERE name = 'root'");
+                    if (mysql_num_rows($qid) == 0) {
+                        $qid = $db->query("REPLACE INTO {$a_o}_tbl (name, lft, rgt, added_datetime) VALUES ('root', 1, 2, NOW())");                    
+                    }                    
                 }
+
             }
         }
@@ -357 +366 @@
 
         // 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;
@@ -418 +428 @@
         $this->initDB();
 
-        // If any access objects are null, assume using root values.
-        $aro = is_null($aro) ? 'root' : $aro;
-        $aco = is_null($aco) ? 'root' : $aco;
-        $axo = is_null($axo) ? 'root' : $axo;
+        // If any access objects are null or empty, assume using root values.
+        $aro = is_null($aro) || '' == trim($aro) ? 'root' : $aro;
+        $aco = is_null($aco) || '' == trim($aco) ? 'root' : $aco;
+        $axo = is_null($axo) || '' == trim($axo) ? 'root' : $axo;
         
         $cache_hash = $aro . '|' . $aco . '|' . $axo;