X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=ba074262d3123d2117875e3783b236f4deb1e02a;hb=fc913f79acb00d7b330c9275bdb98dadd8378963;hp=df5a884e95c19a3849e62bec6d7693484ae4e8a1;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index df5a884e95..ba074262d3 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -90,13 +90,15 @@ function setConfigEntry ($configEntry, $value) {
 
 // Checks wether the given config entry is set
 function isConfigEntrySet ($configEntry) {
-	//* DEBUG: */ debugOutput(__FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])));
+	//* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(isset($GLOBALS['config'][$configEntry])));
 	return (isset($GLOBALS['config'][$configEntry]));
 }
 
 // Merges $GLOBALS['config'] with data in given array
 function mergeConfig ($newConfig) {
 	$GLOBALS['config'] = merge_array(getConfigArray(), $newConfig);
+
+	// Remove all cached entries
 }
 
 // Increment or init with given value or 1 as default the given config entry
@@ -193,7 +195,7 @@ function updateOldConfigFile () {
 
 			// Is the line found?
 			if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
-				// Entry found!
+				// Entry found
 				//* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
 
 				// Eval the line...
@@ -218,7 +220,7 @@ function updateOldConfigFile () {
 					$new = strtolower($new);
 				} // END - if
 
-				/// ... and write it to the new config
+				// ... and write it to the new config
 				//* DEBUG: */ debugOutput('function=' . $function . ',new=' . $new . ',comment=' . $comment);
 				changeDataInInclude(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
 				//* DEBUG: */ debugOutput('CHANGED!');
@@ -239,7 +241,7 @@ function updateOldConfigFile () {
 
 		// Is the $MySQL found?
 		if (substr($line, 0, 6) == '$MySQL') {
-			// Okay found!
+			// Okay, found
 			$found = true;
 		} elseif ($found === true) {
 			// Now check this row
@@ -271,9 +273,11 @@ function updateOldConfigFile () {
 }
 
 // Update config entries
-function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
+function updateConfiguration ($entries, $values, $updateMode = '', $config = '0') {
 	// Do not update config in CSS mode
 	if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
+		// This logger line may be very noisy
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstallationPhase()=' . intval(isInstallationPhase()));
 		return;
 	} // END - if
 
@@ -350,8 +354,10 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 
 // Filter for loading configuration
 function FILTER_LOAD_CONFIGURATION ($no = '0') {
-	// Is the value null, fix it :(
-	if (is_null($no)) $no = '0';
+	// Is the value null, it comes from the 'init' filter chain
+	if (is_null($no)) {
+		$no = '0';
+	} // END - if
 
 	// Check for cache extension, cache-array and if the requested configuration is in cache
 	if ((isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {