Security line in all includes changed

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

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 8e254a61e504f8ed4b456cebb054addfda07febd..b77ee5259a592a2fb2d8046279659f7bae0f5ab6 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);
 }
@@ -178,7 +177,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 +185,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]);
@@ -255,6 +254,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 +271,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 +293,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 +364,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 +379,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();
        }
 }