- if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) {
- //* DEBUG: */ echo "<PRE>";
- //* DEBUG: */ print_r($cacheArray['admins']);
-
- // The cache file seems to be fine
- foreach ($cacheArray['admins']['login'] as $k => $login) {
- // 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") {
- // Default ACL
- $cacheArray['admins']['def_acl'][$aid] = $cacheArray['admins']['def_acl'][$k];
- if (GET_EXT_VERSION("admins") >= "0.6.7") {
- // "Logical Area" mode
- $cacheArray['admins']['la_mode'][$aid] = $cacheArray['admins']['la_mode'][$k];
- if (GET_EXT_VERSION("admins") >= "0.7.0") {
- // 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
-
- //* DEBUG: */ print_r($cacheArray['admins']);
-
- // Clear array
- foreach (array('aid', 'def_acl', 'la_mode', 'password', 'email', 'login_failtures', 'last_failture') as $rem) {
- if (isset($cacheArray['admins'][$rem][$k])) unset($cacheArray['admins'][$rem][$k]);
+ if (count($GLOBALS['cache_array']['admin']['login']) == count($GLOBALS['cache_array']['admin']['admin_id'])) {
+ // Rewrite the cache
+ $admins = array();
+ foreach ($GLOBALS['cache_array']['admin']['login'] as $idx => $admin) {
+ // Rewrite all entries
+ foreach ($GLOBALS['cache_array']['admin'] as $key => $entry) {
+ // Do we have login or regular entries?
+ if ($key == 'login') {
+ // Login, so use id
+ $admins[$key][$GLOBALS['cache_array']['admin']['admin_id'][$idx]] = $entry[$idx];
+ } else {
+ // Regular entry so use login
+ $admins[$key][$GLOBALS['cache_array']['admin']['login'][$idx]] = $entry[$idx];
+ }