X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=39b032af951642da048e0253eb17dbbf7acc5f77;hp=d4f1f91f14756ece9f38d29f32156aee9ebe744e;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=41e2891fb998d13b22b8d7984358f258cc85267d

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index d4f1f91f14..39b032af95 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -32,59 +32,42 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
+// Make cacheInstance global
+global $cacheInstance;
+
 // Next cached table is the configuration (config)...
-if ($cacheInstance->cache_file("config", true) == true) {
+if (($cacheInstance->loadCacheFile("config", true)) && ($cacheInstance->extensionVersionMatches("sql_patches"))) {
 	// Load config from cache
 	global $cacheArray;
-	$cacheArrayConfig = $cacheInstance->cache_load();
-
-	// Valid cache file
-	$CNT = 0; $newCache = array();
-	foreach ($cacheArrayConfig as $key => $array) {
-		foreach ($array as $key2 => $value) {
-			$newCache[$key2][$key] = $value;
-		}
-		$CNT += count($array);
-	}
-
-	// Overwrite the config with the cache version
-	$cacheArray['config'] = $newCache;
-	unset($newCache);
+	$cacheArray['config'] = $cacheInstance->getArrayFromCache();
 
-	// When there is a period (.) in the result this test will fail and so the cache file is
-	// damaged/corrupted
-	$TEST = "failed";
-	if (count($cacheArray['config']) > 0 ) $TEST = ($CNT / (count($cacheArray['config'])));
-	if ($TEST != bigintval($TEST)) {
-		// Cache file is corrupted!
-		$cacheInstance->cache_destroy();
-		unset($cacheArray['config']);
-	}
-} elseif (($_CONFIG['cache_config'] == "Y") && ($CSS != "1") && ($CSS != "-1")) {
+	// @TODO: Do we really need to cache the config???
+} elseif ((getConfig('cache_config') == "Y") && ($CSS != "1") && ($CSS != "-1")) {
 	// Create cache file here
-	$cacheInstance->cache_init("CONFIG");
+	$cacheInstance->init("CONFIG");
+	$cacheInstance->storeExtensionVersion("sql_patches");
 
 	// Load all modules and their data
-	$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHARRAY($result)) {
+	$result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}_config` ORDER BY config ASC", __FILE__, __LINE__);
+	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 the cache
+	$cacheInstance->finalize();
+
 	// Reload the cache
-	require(__FILE__);
+	LOAD_INC(__FILE__);
 }
 
-// Close file
-$cacheInstance->cache_close();
-
 //
 ?>