X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-admin.php;h=eef5335ccb7f86516cbe88661b01582b58048834;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;hp=336732ba9aabe3f213eadda4a5da50cb9f5d7efe;hpb=6586600d8020147192e5f28ca2a3a0153f774d3c;p=mailer.git

diff --git a/inc/loader/load_cache-admin.php b/inc/loader/load_cache-admin.php
index 336732ba9a..eef5335ccb 100644
--- a/inc/loader/load_cache-admin.php
+++ b/inc/loader/load_cache-admin.php
@@ -37,6 +37,9 @@ if (!defined('__SECURITY')) {
 	require($INC);
 } // END - if
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Let's start with the admins table...
 if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersionMatches("admins"))) {
 	// Load cache
@@ -80,20 +83,17 @@ if (($cacheInstance->loadCacheFile("admins")) && ($cacheInstance->extensionVersi
 		$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->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
@@ -107,7 +107,7 @@ ORDER BY login", __FILE__, __LINE__);
 	$cacheInstance->finalize();
 
 	// Reload the cache
-	require(__FILE__);
+	LOAD_INC(__FILE__);
 }
 
 // Next cached table are the admins_acls...
@@ -117,13 +117,13 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
 		// Load referal system from cache
 		global $cacheArray;
 		$cacheArray['admin_acls'] = $cacheInstance->getArrayFromCache();
-	} elseif (($_CONFIG['cache_acls'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	} elseif ((getConfig('cache_acls') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
 		// Create cache file here
 		$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)) {
@@ -138,7 +138,7 @@ if (GET_EXT_VERSION("admins") >= "0.3") {
 		$cacheInstance->finalize();
 
 		// Reload the cache
-		require(__FILE__);
+		LOAD_INC(__FILE__);
 	}
 } // END - if