X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Floader%2Fload_cache-config.php;h=83866fe2792a1fcb32d6daabe568f40ac6b4a5a2;hb=fe926f4aba9db3700c217f4170855e3b693b83db;hp=8f7e4a7e7b5cbeb74f1decc5b74960dc361b77d1;hpb=8a7b405ec86c2f0670435547acb497b9583d481c;p=mailer.git

diff --git a/inc/loader/load_cache-config.php b/inc/loader/load_cache-config.php
index 8f7e4a7e7b..83866fe279 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                            *
@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * 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 *
@@ -38,35 +39,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();
-} elseif ((getConfig('cache_config') == 'Y') && (getOutputMode() != '1') && (getOutputMode() != '-1')) {
+	$config = $GLOBALS['cache_instance']->getArrayFromCache();
+
+	// 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]
 ?>