X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Floader%2Fload_cache-config.php;h=1bf71bbc64fdccbd6935d22e712d681ecb22170f;hb=0a4b0f81eea5f4daf5e55e695d79a0ee2669bdd8;hp=ad3342a43574d82a7f8ea23f902579883e0f7235;hpb=b7aada7890a3c7d1c1da4d2b36d8d7683fa61c06;p=mailer.git

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index ad3342a435..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 *
@@ -33,37 +37,45 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
+	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 (($GLOBALS['cache_instance']->loadCacheFile("config", true)) && ($GLOBALS['cache_instance']->extensionVersionMatches("sql_patches"))) {
+if (($GLOBALS['cache_instance']->loadCacheFile('config')) && ($GLOBALS['cache_instance']->extensionVersionMatches('sql_patches'))) {
 	// Load config from cache
-	$GLOBALS['cache_array']['config'] = $GLOBALS['cache_instance']->getArrayFromCache();
+	$config = $GLOBALS['cache_instance']->getArrayFromCache();
 
-	// @TODO: Do we really need to cache the config???
-} elseif ((getConfig('cache_config') == "Y") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) {
+	// 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
+
+	// Remove dummy array
+	unset($config);
+} elseif (isHtmlOutputMode()) {
 	// Create cache file here
-	$GLOBALS['cache_instance']->init("CONFIG");
-	$GLOBALS['cache_instance']->storeExtensionVersion("sql_patches");
+	$GLOBALS['cache_instance']->init();
 
 	// Load all modules and their data
-	$result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}_config` ORDER BY config ASC", __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
-		$GLOBALS['cache_instance']->addRow($data);
+		$GLOBALS['cache_instance']->addRow($content);
 	} // END - while
 
 	// Free memory
 	SQL_FREERESULT($result);
 
 	// Close the cache
+	$GLOBALS['cache_instance']->storeExtensionVersion('sql_patches');
 	$GLOBALS['cache_instance']->finalize();
-
-	// Include loader again
-	require(__FILE__);
 }
 
-//
+// [EOF]
 ?>