Template fixes, lesser admin data will be loaded from database

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 8e254a61e504f8ed4b456cebb054addfda07febd..65325e1a698ca1b755a5a82b27e9e2038d9be255 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -32,8 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -57,10 +56,7 @@ function ADMINS_CHECK_ACL($act, $wht) {
                $_CONFIG['cache_hits']++;
        } elseif (!is_object($cacheInstance)) {
                // Load from database
-               $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-                array(get_session('admin_login')), __FILE__, __LINE__);
-               list($default) = SQL_FETCHROW($result);
-               SQL_FREERESULT($result);
+               $default = GET_ADMIN_DEFAULT_ACL(get_session('admin_login'));
        }
 
        // Get admin's ID
@@ -178,7 +174,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
        global $cacheInstance;
 
        // Begin the update
-       $cacheInstance_UPDATE = 0;
+       $cache_update = 0;
        foreach ($POST['login'] as $id => $login) {
                // Secure ID number
                $id = bigintval($id);
@@ -186,7 +182,7 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                // When both passwords match update admin account
                if ($POST['pass1'][$id] == $POST['pass2'][$id]) {
                        // Save only when both passwords are the same (also when they are empty)
-                       $ADD = ""; $cacheInstance_UPDATE = "1";
+                       $ADD = ""; $cache_update = "1";
 
                        // Generate hash
                        $hash = generateHash($POST['pass1'][$id]);
@@ -213,16 +209,10 @@ function ADMINS_CHANGE_ADMIN_ACCOUNT($POST) {
                                        // Update password cookie
                                        set_session("admin_md5", $hash);
                                }
-
-                       }
+                       } // END - if
 
                        // Get default ACL from admin to check if we can allow him to change the default ACL
-                       $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
-                        array(get_session('admin_login')), __FILE__, __LINE__);
-                       list($default) = SQL_FETCHROW($result);
-
-                       // Free result
-                       SQL_FREERESULT($result);
+                       $default = GET_ADMIN_DEFAULT_ACL(get_session('admin_login'));
 
                        // Update admin account
                        if ($default == "allow") {
@@ -255,6 +245,9 @@ WHERE id=%s LIMIT 1",
 ), __FILE__, __LINE__);
                        }
 
+                       // Purge cache
+                       CACHE_PURGE_ADMIN_MENU($id);
+
                        // Admin account saved
                        $MSG = ADMIN_ACCOUNT_SAVED;
                } else {
@@ -269,7 +262,7 @@ WHERE id=%s LIMIT 1",
        }
 
        // Remove cache file
-       if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
+       if ((EXT_IS_ACTIVE("cache")) && ($cache_update == "1")) {
                if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
        }
 }
@@ -291,8 +284,8 @@ function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
                        SQL_FREERESULT($result);
 
                        // Prepare some more data for the template
-                       $content['sw']          = $SW;
-                       $content['id']          = $id;
+                       $content['sw'] = $SW;
+                       $content['id'] = $id;
 
                        // Shall we allow changing default ACL?
                        if ($content['mode'] == "allow") {
@@ -362,7 +355,7 @@ function ADMINS_DELETE_ADMIN_ACCOUNTS ($POST) {
 // Remove the given accounts
 function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
        // Begin removal
-       $cacheInstance_UPDATE = 0;
+       $cache_update = 0;
        foreach ($POST['sel'] as $id => $del) {
                // Secure ID number
                $id = bigintval($id);
@@ -377,12 +370,14 @@ function ADMINS_REMOVE_ADMIN_ACCOUNTS ($POST) {
                        $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
                         array($id), __FILE__, __LINE__);
 
-                       $cacheInstance_UPDATE = "1";
+                       // Purge cache
+                       CACHE_PURGE_ADMIN_MENU($id);
+                       $cache_update = "1";
                }
        }
 
        // Remove cache if cache system is activated
-       if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance_UPDATE == "1")) {
+       if ((EXT_IS_ACTIVE("cache")) && ($cache_update == "1")) {
                if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
        }
 }