BLOB->TEXT rewritten, all _user tables now handled by ext-user, except user_book...

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index cb34ef32ef56565e117a36135abb8bdc131070c3..665f2e9bf8e4bfad40bcb5d2562781fe38ae5c72 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -70,64 +70,49 @@ function ADMINS_CHECK_ACL($act, $wht) {
        }
 
        // Shall I test for a main or sub menu? (action or what?)
-       $lines = 0; $acl_mode = "failed";
+       $acl_mode = "failed";
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
-               // Load only from array when there are lines!
-               if ((isset($GLOBALS['cache_array']['admin_acls'])) && (is_array($GLOBALS['cache_array']['admin_acls'])) && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
-                       // Load ACL from array
-                       foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $id => $aid_acls) {
-                               if ($aid == $aid_acls) {
-                                       // Okay, one line was found!
-                                       if ((!empty($act)) && ($GLOBALS['cache_array']['admin_acls']['action_menu'][$id] == $act)) {
-                                               // Main menu line found
-                                               $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
-                                               $lines = 1;
-                                       }
-                                        elseif ((!empty($wht)) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$id] == $wht)) {
-                                               // Check sub menu
-                                               $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
-                                               $lines = 1;
-                                       }
-                                       if ($lines == 1) {
-                                               // Count cache hits
-                                               incrementConfigEntry('cache_hits');
-                                               break;
-                                       }
-                               }
-                       }
-
-                       // No ACL found?
-                       if ($acl_mode == "failed") {
-                               $acl_mode = "";
-                               $lines = 0;
-                       }
-               } else {
-                       // No lines here
-                       $lines = 0;
+               // Lookup in cache
+               if ((!empty($act)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid] == $act)) {
+                       // Main menu line found
+                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+                       // Count cache hits
+                       incrementConfigEntry('cache_hits');
+               } elseif ((!empty($wht)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid])) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid] == $wht)) {
+                       // Check sub menu
+                       $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+                       // Count cache hits
+                       incrementConfigEntry('cache_hits');
                }
        } else {
                // Old version, so load it from database
-               if (!empty($act))
-               {
+               if (!empty($act)) {
                        // Main menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $act), __FUNCTION__, __LINE__);
+                               array(bigintval($aid), $act), __FUNCTION__, __LINE__);
                } elseif (!empty($wht)) {
                        // Sub menu
                        $result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
-                        array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
+                               array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
                }
 
-               // Get number of lines
-               $lines = SQL_NUMROWS($result);
+               // Is an entry found?
+               if (SQL_NUMROWS($result) == 1) {
+                       // Load ACL
+                       list($acl_mode) = SQL_FETCHROW($result);
+               } // END - if
 
-               // Load ACL
-               list($acl_mode) = SQL_FETCHROW($result);
+               // Free memory
                SQL_FREERESULT($result);
        }
 
        // Check ACL and (maybe) allow
-       if ((($default == "allow") && ($lines == 0)) || (($default == "deny") && ($lines == "1") && ($acl_mode == "allow")) || (($lines == 0) && ($parent))) $ret = true;
+       if (($default == "allow") || (($default == "deny") && ($acl_mode == "allow")) || ($parent === true)) {
+               // Access is granted
+               $ret = true;
+       } // END - if
 
        // Return value
        return $ret;