Changeset 177

Timestamp:

Jun 22, 2006 6:10:45 PM (18 years ago)

Author:

scdev

Message:

Q - Fixed bug in ACL (checking ancestors for access cascade). Modified App::raiseMsg so duplicate msgs will not be set.

Location:

trunk/lib

Files:

• ACL.inc.php (modified) (1 diff)
• App.inc.php (modified) (1 diff)

trunk/lib/ACL.inc.php

@@ -638 +638 @@
                 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) . "')
+                WHERE (aro_tbl.lft <= (SELECT lft FROM aro_tbl WHERE name = '" . $db->escapeString($aro) . "') AND aro_tbl.rgt >= (SELECT rgt FROM aro_tbl WHERE name = '" . $db->escapeString($aro) . "'))
+                AND (aco_tbl.lft <= (SELECT lft FROM aco_tbl WHERE name = '" . $db->escapeString($aco) . "') AND aco_tbl.rgt >= (SELECT rgt FROM aco_tbl WHERE name = '" . $db->escapeString($aco) . "'))
+                AND (axo_tbl.lft <= (SELECT lft FROM axo_tbl WHERE name = '" . $db->escapeString($axo) . "') AND axo_tbl.rgt >= (SELECT rgt 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)) {
+                $this->cache->set($cache_hash, 'deny');
                 $app->logMsg(sprintf('Access denyed: %s -> %s -> %s. No records found.', $aro, $aco, $axo), LOG_DEBUG, __FILE__, __LINE__);
                 return false;

trunk/lib/App.inc.php

@@ -371 +371 @@
 
         // Save message in session under unique key to avoid duplicate messages.
-        $msg_id = md5($type . $message . $file . $line);
-        $_SESSION['_app'][$this->_ns]['messages'][$msg_id] = array(
-            'type'    => $type,
-            'message' => $message,
-            'file'    => $file,
-            'line'    => $line,
-            'count'   => (isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) : 1)
-        );
+        $msg_id = md5($type . $message);
+        if (!isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id])) {
+            $_SESSION['_app'][$this->_ns]['messages'][$msg_id] = array(
+                'type'    => $type,
+                'message' => $message,
+                'file'    => $file,
+                'line'    => $line,
+                'count'   => (isset($_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) ? (1 + $_SESSION['_app'][$this->_ns]['messages'][$msg_id]['count']) : 1)
+            );
+        }
 
         if (!in_array($type, array(MSG_NOTICE, MSG_SUCCESS, MSG_WARNING, MSG_ERR))) {