query masking rewritten in more SQLs, several cleanups and fix on beg link

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index e3e1ca6311bb8585b1664e954c2b7fffcb61bcea..eb79a8c705c213ac7623cfacf21adfefe7080930 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -40,24 +40,22 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 //
 function ADMINS_CHECK_ACL($act, $wht)
 {
-       global $_COOKIE, $ADMINS, $ADMINS_ACLS, $CONFIG;
+       global $ADMINS, $ADMINS_ACLS, $CONFIG, $CACHE;
        // If action is login or logout allow allways!
+       $default = "allow";
        if (($act == "login") || ($act == "logout")) return true;
 
        // Default is deny
        $ret = false;
 
        // Get admin's defult access right
-       if (!empty($ADMINS['def_acl'][$_COOKIE['admin_login']]))
-       {
+       if (!empty($ADMINS['def_acl'][$_COOKIE['admin_login']])) {
                // Load from cache
                $default = $ADMINS['def_acl'][$_COOKIE['admin_login']];
 
                // Count cache hits
                $CONFIG['cache_hits']++;
-       }
-        else
-       {
+       } elseif (!is_object($CACHE)) {
                // Load from database
                $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
                 array($_COOKIE['admin_login']), __FILE__, __LINE__);