X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-admin.php;h=5f240f552632a7ca7b4d2065ec024cba0657c0f9;hb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;hp=2de94871bceb7ac3a2c929708d53fb2ee867f209;hpb=2305bb069ede07db6227ab5e51960e501e75d7e6;p=mailer.git

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 2de94871bc..5f240f5526 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -37,137 +37,109 @@ if (!defined('__SECURITY')) {
 	require($INC);
 } // END - if
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Let's start with the admins table...
-if (($cacheInstance->cache_file("admins", true) == true) && ($cacheInstance->ext_version_matches("admins"))) {
+if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersionMatches("admins"))) {
 	// Load cache
 	global $cacheArray;
-	$cacheArray['admins'] = $cacheInstance->cache_load();
+	$cacheArray['admins'] = $cacheInstance->getArrayFromCache();
 
 	// Check if valid
-	if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
+	if ((isset($cacheArray['admins']['login'])) && (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 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
+			// 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();
+			$cacheInstance->destroyCacheFile();
+			unset($cacheArray['admins']);
 		}
 	} else {
 		// Nope, cache file is corrupted!
-		$cacheInstance->cache_destroy();
+		$cacheInstance->destroyCacheFile();
 		unset($cacheArray['admins']);
 	}
-} elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_admins') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file
-	$cacheInstance->cache_init("ADMINS");
-	$cacheInstance->store_extension_version("admins");
+	$cacheInstance->init("ADMINS");
+	$cacheInstance->storeExtensionVersion("admins");
 
 	// Load every data from DB to cache file
-	$ADD = ", id, id";
-	if (GET_EXT_VERSION("admins") >= "0.3")   $ADD  = ", default_acl AS def_acl";
-	if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
-	if (GET_EXT_VERSION("admins") >= "0.7.0") $ADD .= ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
+	$ADD = RUN_FILTER('sql_admin_extra_data');
 
 	// Query the database about this
 	$result_admins = SQL_QUERY("SELECT id AS aid, login, password, email".$ADD."
-FROM "._MYSQL_PREFIX."_admins
+FROM `{!_MYSQL_PREFIX!}_admins`
 ORDER BY login", __FILE__, __LINE__);
 	while($dummy = SQL_FETCHARRAY($result_admins)) {
 		// Save row
-		$cacheInstance->add_row($dummy);
+		$cacheInstance->addRow($dummy);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result_admins);
 
 	// Close cache
-	$cacheInstance->cache_close();
+	$cacheInstance->finalize();
 
 	// Reload the cache
 	require(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 // Next cached table are the admins_acls...
 if (GET_EXT_VERSION("admins") >= "0.3") {
 	// Check for cache file
-	if ($cacheInstance->cache_file("admins_acls", true) == true) {
+	if (($cacheInstance->loadCacheFile("admins_acls")) && ($cacheInstance->extensionVersionMatches("admins"))) {
 		// Load referal system from cache
 		global $cacheArray;
-		$cacheArray['admin_acls'] = $cacheInstance->cache_load();
-	} elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+		$cacheArray['admin_acls'] = $cacheInstance->getArrayFromCache();
+	} elseif ((getConfig('cache_acls') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
 		// Create cache file here
-		$cacheInstance->cache_init("ADMINS_ACLS");
+		$cacheInstance->init("ADMINS_ACLS");
+		$cacheInstance->storeExtensionVersion("admins");
 
 		// Load all modules and their data
-		$result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM "._MYSQL_PREFIX."_admins_acls ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+		$result = SQL_QUERY("SELECT id, admin_id, action_menu, what_menu, access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` ORDER BY admin_id, action_menu, what_menu", __FILE__, __LINE__);
+
+		// Add all rows
 		while ($data = SQL_FETCHARRAY($result)) {
 			// Add row to cache file
-			$cacheInstance->add_row($data);
+			$cacheInstance->addRow($data);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
+		// Close cache
+		$cacheInstance->finalize();
+
 		// Reload the cache
 		require(__FILE__);
 	}
-
-	// Close file
-	$cacheInstance->cache_close();
 } // END - if
 
 //