Now all admin functions depend on admin id, before login/aid mixed

[mailer.git] / inc / loader / load_cache-admin.php

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 59d7a09812b01156a926af2771ee478869583abc..2de94871bceb7ac3a2c929708d53fb2ee867f209 100644 (file)
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -52,19 +52,27 @@ if (($cacheInstance->cache_file("admins", true) == true) && ($cacheInstance->ext
 
                        // The cache file seems to be fine
                        foreach ($cacheArray['admins']['login'] as $k => $login) {
-                               // Rewrite default_acl
-                               $cacheArray['admins']['aid'][$login]      = $cacheArray['admins']['aid'][$k];
-                               $cacheArray['admins']['password'][$login] = $cacheArray['admins']['password'][$k];
-                               $cacheArray['admins']['email'][$login]    = $cacheArray['admins']['email'][$k];
+                               // Rewrite admin id
+                               $cacheArray['admins']['aid'][$login]    = $cacheArray['admins']['aid'][$k];
+
+                               // Shortcut admin id
+                               $aid = $cacheArray['admins']['aid'][$login];
+
+                               // Rewrite others...
+                               $cacheArray['admins']['password'][$aid] = $cacheArray['admins']['password'][$k];
+                               $cacheArray['admins']['email'][$aid]    = $cacheArray['admins']['email'][$k];
 
                                // Some extra data depending on version
                                if (GET_EXT_VERSION("admins") >= "0.3") {
-                                       $cacheArray['admins']['def_acl'][$login]  = $cacheArray['admins']['def_acl'][$k];
+                                       // Default ACL
+                                       $cacheArray['admins']['def_acl'][$aid]  = $cacheArray['admins']['def_acl'][$k];
                                        if (GET_EXT_VERSION("admins") >= "0.6.7") {
-                                               $cacheArray['admins']['la_mode'][$login]  = $cacheArray['admins']['la_mode'][$k];
+                                               // "Logical Area" mode
+                                               $cacheArray['admins']['la_mode'][$aid]  = $cacheArray['admins']['la_mode'][$k];
                                                if (GET_EXT_VERSION("admins") >= "0.7.0") {
-                                                       $cacheArray['admins']['login_failtures'][$login] = $cacheArray['admins']['login_failtures'][$k];
-                                                       $cacheArray['admins']['last_failture'][$login]   = $cacheArray['admins']['last_failture'][$k];
+                                                       // Login failtures
+                                                       $cacheArray['admins']['login_failtures'][$aid] = $cacheArray['admins']['login_failtures'][$k];
+                                                       $cacheArray['admins']['last_failture'][$aid]   = $cacheArray['admins']['last_failture'][$k];
                                                } // END - if
                                        } // END - if
                                } // END - if