X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=1bf71bbc64fdccbd6935d22e712d681ecb22170f;hb=ee3e99bb6cc6ae2b14d12436f2bb0a23ab698ceb;hp=94d88621e0553c436a98d3c0b5549fc1c7e6b6fb;hpb=00c41ee95139ba90f2ed355da6503f03fb9096a3;p=mailer.git

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 94d88621e0..1bf71bbc64 100644
--- a/inc/loader/load_cache-config.php
+++ b/inc/loader/load_cache-config.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/09/2008 *
- * ===============                              Last change: 09/09/2008 *
+ * Mailer v0.2.1-FINAL                                Start: 09/09/2008 *
+ * ===================                          Last change: 09/09/2008 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : load_cache-config.php                            *
@@ -10,9 +10,13 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Mehr Cache-Dateien nachladen                     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,56 +36,46 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+if (!defined('__SECURITY')) {
+	die();
 }
 
+// Use this code if you don't want to run this cache loader on installation phase
+if (isInstallationPhase()) return;
+
 // Next cached table is the configuration (config)...
-if ($cacheInstance->cache_file("config", true) == true) {
+if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_instance']->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);
-	}
+	$config = $GLOBALS['cache_instance']->getArrayFromCache();
 
-	// Overwrite the config with the cache version
-	$cacheArray['config'] = $newCache;
-	unset($newCache);
+	// Swap cache
+	foreach ($config as $entry => $array) {
+		// All config levels
+		foreach ($array as $key => $value) {
+			$GLOBALS['cache_array']['config'][$key][$entry] = $value;
+		} // END - foreach
+	} // END - foreach
 
-	// 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")) {
+	// Remove dummy array
+	unset($config);
+} elseif (isHtmlOutputMode()) {
 	// Create cache file here
-	$cacheInstance->cache_init("CONFIG");
+	$GLOBALS['cache_instance']->init();
 
 	// 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 ($content = SQL_FETCHARRAY($result)) {
 		// Add row to cache file
-		$cacheInstance->add_row($DATA);
-	}
+		$GLOBALS['cache_instance']->addRow($content);
+	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
-}
 
-// Close file
-$cacheInstance->cache_close();
+	// Close the cache
+	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
+	$GLOBALS['cache_instance']->finalize();
+}
 
-//
+// [EOF]
 ?>