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

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index d4f1f91f14..8139855b7f 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -42,43 +42,23 @@ if ($cacheInstance->cache_file("config", true) == true) {
 	// 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);
-
-	// 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")) {
 	// Create cache file here
 	$cacheInstance->cache_init("CONFIG");
 
 	// Load all modules and their data
 	$result = SQL_QUERY("SELECT * FROM "._MYSQL_PREFIX."_config ORDER BY config", __FILE__, __LINE__);
-	while ($DATA = SQL_FETCHARRAY($result)) {
+	while ($data = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->add_row($DATA);
-	}
+		$cacheInstance->add_row($data);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
+	// Close the cache
+	$cacheInstance->cache_close();
+
 	// Reload the cache
 	require(__FILE__);
 }