X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=7ffffb8c6e1f690152b613e7831658889161612c;hp=7e28bda282bd971f1cb55bd5bda7f4a72061ed13;hb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;hpb=f13b0c89b6dce2dc31ef3c58f0e2ad4821d7bee8

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 7e28bda282..7ffffb8c6e 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -38,109 +38,103 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Let's start with the admins table...
-if (($cacheInstance->cache_file("admins")) && ($cacheInstance->ext_version_matches("admins"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile("admins")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
 	// Load cache
-	global $cacheArray;
-	$cacheArray['admins'] = $cacheInstance->cache_load();
+	$GLOBALS['cache_array']['admins'] = $GLOBALS['cache_instance']->getArrayFromCache();
 
 	// Check if valid
-	if ((is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
+	if ((isset($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['login'])) && (is_array($GLOBALS['cache_array']['admins']['aid']))) {
 		// Check count
-		if (count($cacheArray['admins']['login']) == count($cacheArray['admins']['aid'])) {
+		if (count($GLOBALS['cache_array']['admins']['login']) == count($GLOBALS['cache_array']['admins']['aid'])) {
 			// Get "id map"
-			$idMap = $cacheArray['admins']['aid'];
+			$idMap = $GLOBALS['cache_array']['admins']['aid'];
 
 			// Rewrite the cache array
 			for ($idx = (count($idMap) - 1); $idx >= 0; $idx--) {
 				// Rewrite all entries
-				foreach ($cacheArray['admins'] as $key=>$entryArray) {
+				foreach ($GLOBALS['cache_array']['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];
+						$GLOBALS['cache_array']['admins']['aid'][$GLOBALS['cache_array']['admins']['login'][$idx]] = $entryArray[$idx];
 					} else {
 						// Rewrite regular entry
-						$cacheArray['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
+						$GLOBALS['cache_array']['admins'][$key][$idMap[$idx]] = $entryArray[$idx];
 					}
 
 					// Is the last entry reached?
 					if ($idx == 0) {
 						// Remove it
-						unset($cacheArray['admins'][$key][0]);
+						unset($GLOBALS['cache_array']['admins'][$key][0]);
 					} // END - if
 				} // END - if
 			} // END - for
 		} else {
 			// Nope, cache file is corrupted!
-			$cacheInstance->cache_destroy();
-			unset($cacheArray['admins']);
+			$GLOBALS['cache_instance']->destroyCacheFile();
+			unset($GLOBALS['cache_array']['admins']);
 		}
 	} else {
 		// Nope, cache file is corrupted!
-		$cacheInstance->cache_destroy();
-		unset($cacheArray['admins']);
+		$GLOBALS['cache_instance']->destroyCacheFile();
+		unset($GLOBALS['cache_array']['admins']);
 	}
-} elseif (($_CONFIG['cache_admins'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+} elseif ((getConfig('cache_admins') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 	// Create cache file
-	$cacheInstance->cache_init("ADMINS");
-	$cacheInstance->store_extension_version("admins");
+	$GLOBALS['cache_instance']->init("ADMINS");
+	$GLOBALS['cache_instance']->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 = runFilterChain('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);
+		$GLOBALS['cache_instance']->addRow($dummy);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result_admins);
 
 	// Close cache
-	$cacheInstance->cache_close();
+	$GLOBALS['cache_instance']->finalize();
 
-	// Reload the cache
+	// Include loader again
 	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")) && ($cacheInstance->ext_version_matches("admins"))) {
+	if (($GLOBALS['cache_instance']->loadCacheFile("admins_acls")) && ($GLOBALS['cache_instance']->extensionVersionMatches("admins"))) {
 		// Load referal system from cache
-		global $cacheArray;
-		$cacheArray['admin_acls'] = $cacheInstance->cache_load();
-	} elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+		$GLOBALS['cache_array']['admin_acls'] = $GLOBALS['cache_instance']->getArrayFromCache();
+	} elseif ((getConfig('cache_acls') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
 		// Create cache file here
-		$cacheInstance->cache_init("ADMINS_ACLS");
-		$cacheInstance->store_extension_version("admins");
+		$GLOBALS['cache_instance']->init("ADMINS_ACLS");
+		$GLOBALS['cache_instance']->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);
+			$GLOBALS['cache_instance']->addRow($data);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 
-		// Reload the cache
+		// Close cache
+		$GLOBALS['cache_instance']->finalize();
+
+		// Include loader again
 		require(__FILE__);
 	}
-
-	// Close file
-	$cacheInstance->cache_close();
 } // END - if
 
 //