X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=b9cbd32f4ba18e79e689bfe6b42c5a5f8405b72b;hb=d798a412acb8c1263933bd7f7a0fd9aa251495a7;hp=9210709caa2b5394c7efcb0d2ce86767ce5445ef;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 9210709caa..b9cbd32f4b 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -47,53 +47,33 @@ if (($cacheInstance->cache_file("admins", true) == true) && ($cacheInstance->ext
 	if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
 		// Check count
 		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 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];
-
-				// Some extra data depending on version
-				if (GET_EXT_VERSION("admins") >= "0.3") {
-					$cacheArray['admins']['def_acl'][$login]  = $cacheArray['admins']['def_acl'][$k];
-					if (GET_EXT_VERSION("admins") >= "0.6.7") {
-						$cacheArray['admins']['la_mode'][$login]  = $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];
-						} // END - if
+			// Get "id map"
+			$idMap = $cacheArray['admins']['aid'];
+
+			// Rewrite the cache array
+			for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) {
+				// Rewrite all entries
+				foreach ($cacheArray['admins'] as $key=>$entryArray) {
+					// Rewrite the entry
+					if ($key == "aid") {
+						// Rewrite admin id (use login name as index)
+						$cacheArray['admins']['aid'][$cacheArray['admins']['login'][$idx]] = $entryArray[$idx];
+					} else {
+						// Rewrite regular entry
+						$cacheArray['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
+					}
+
+					// Is the last entry reached?
+					if ($idx == 0) {
+						// Remove it
+						unset($cacheArray['admins'][$key][0]);
 					} // 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]);
-				} // END - foreach
-			} // END - if
-
-			//* DEBUG: */ print_r($cacheArray['admins']);
-
-			// Rewrite Login
-			foreach ($cacheArray['admins']['login'] as $k => $login) {
-				$cacheArray['admins']['login'][$cacheArray['admins']['aid'][$login]] = $login;
-				if (!in_array($k, $cacheArray['admins']['aid'])) {
-					unset($cacheArray['admins']['login'][$k]);
-				} // END - if
-			} // END - foreach
-
-			//* DEBUG: */ echo "****\n";
-			//* DEBUG: */ print_r($cacheArray['admins']);
-			//* DEBUG: */ echo "</PRE>";
-			//* DEBUG: */ die();
+			} // END - for
 		} else {
 			// Nope, cache file is corrupted!
 			$cacheInstance->cache_destroy();
+			unset($cacheArray['admins']);
 		}
 	} else {
 		// Nope, cache file is corrupted!
@@ -137,7 +117,7 @@ $cacheInstance->cache_close();
 if (GET_EXT_VERSION("admins") >= "0.3") {
 	// Check for cache file
 	if ($cacheInstance->cache_file("admins_acls", true) == true) {
-		// Load referral system from cache
+		// Load referal system from cache
 		global $cacheArray;
 		$cacheArray['admin_acls'] = $cacheInstance->cache_load();
 	} elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {