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

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index e29f3e2bfd..5f240f5526 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -37,11 +37,14 @@ if (!defined('__SECURITY')) {
 	require($INC);
 } // END - if
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Let's start with the admins table...
-if (($cacheInstance->cache_file("admins")) && ($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 ((isset($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['login'])) && (is_array($cacheArray['admins']['aid']))) {
@@ -72,80 +75,71 @@ if (($cacheInstance->cache_file("admins")) && ($cacheInstance->ext_version_match
 			} // 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")) && ($cacheInstance->ext_version_matches("admins"))) {
+	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->store_extension_version("admins");
+		$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->cache_close();
+		$cacheInstance->finalize();
 
 		// Reload the cache
 		require(__FILE__);
 	}
-
-	// Close file
-	$cacheInstance->cache_close();
 } // END - if
 
 //