X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=ba074262d3123d2117875e3783b236f4deb1e02a;hb=5d8f02c56cda6c3e960b50d066e9c556d368a0ff;hp=a7f4ac979404ea5771fc78dea58722b109bafe01;hpb=74ca3a5c7b7546d96758217608ead67975d42dc3;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index a7f4ac9794..ba074262d3 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -6,9 +6,9 @@
  * -------------------------------------------------------------------- *
  * File              : config-functions.php                             *
  * -------------------------------------------------------------------- *
- * Short description : Many non-MySQL functions (also file access)      *
+ * Short description : Configuration functions                          *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
+ * Kurzbeschreibung  : Konfigurationsfunktionen                         *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -71,9 +71,6 @@ function initConfig () {
 
 // Getter for $GLOBALS['config'] entries
 function getConfig ($configEntry) {
-	// Default value
-	$value = null;
-
 	// Is the entry there?
 	if (!isConfigEntrySet($configEntry)) {
 		// Raise an error of missing entries
@@ -93,18 +90,20 @@ 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
 function incrementConfigEntry ($configEntry, $value=1) {
-	// Increment it if set or init it with 1
+	// Increment it if set or init it with $value
 	if (isConfigEntrySet($configEntry)) {
 		$GLOBALS['config'][$configEntry] += $value;
 	} else {
@@ -196,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...
@@ -221,9 +220,9 @@ 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);
-				changeDataInFile(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
+				changeDataInInclude(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
 				//* DEBUG: */ debugOutput('CHANGED!');
 
 				// Mark it as done
@@ -242,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
@@ -262,7 +261,7 @@ function updateOldConfigFile () {
 			$key = substr(trim($parts[0]), 1, -1); $value = substr(trim($parts[1]), 1, -2);
 
 			// We can now save the right part in new config file
-			changeDataInFile(getCachePath() . 'config-local.php', $comments[$key], "	'".$key."'     => \"", '",', $value, 0);
+			changeDataInInclude(getCachePath() . 'config-local.php', $comments[$key], "	'".$key."'     => \"", '",', $value, 0);
 		}
 	} // END - foreach
 
@@ -274,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
 
@@ -353,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]))) {