X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fconfig-functions.php;h=84f442bb553ff2ce1eda957eb2ea5434d508ec50;hb=c49ddd4ffb10ecc8a418cf58dcdb7ba528001e5f;hp=01d538db1977cd093cbb6e9edb1239a021e9220d;hpb=5046dfa92d45a31028460a45080a88ceca3fe0c3;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 01d538db19..84f442bb55 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -45,7 +45,7 @@ function initConfig () {
 	// Init not if already found
 	if (isConfigurationLoaded()) {
 		// Already initialized
-		debug_report_bug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
+		reportBug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
 	} // END - if
 
 	// Set a minimum of configuration, required to by-pass some error triggers in getConfig()
@@ -74,7 +74,7 @@ function getConfig ($configEntry) {
 	// Is the entry there?
 	if (!isConfigEntrySet($configEntry)) {
 		// Raise an error of missing entries
-		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry <span class=\"data\">%s</span> is missing.", $configEntry));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Configuration entry <span class=\"data\">%s</span> is missing.", $configEntry));
 	} // END - if
 
 	// Return it
@@ -88,14 +88,15 @@ function setConfigEntry ($configEntry, $value) {
 	$GLOBALS['config'][$configEntry] = $value;
 }
 
-// Checks wether the given config entry is set
+// Checks whether the given config entry is set
 function isConfigEntrySet ($configEntry) {
 	//* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(isset($GLOBALS['config'][$configEntry])));
-	return (isset($GLOBALS['config'][$configEntry]));
+	return ((isset($GLOBALS['config'][$configEntry])) || (array_key_exists($configEntry, $GLOBALS['config'])));
 }
 
 // Merges $GLOBALS['config'] with data in given array
 function mergeConfig ($newConfig) {
+	// Merge current configuration with new one
 	$GLOBALS['config'] = merge_array(getConfigArray(), $newConfig);
 }
 
@@ -109,7 +110,7 @@ function incrementConfigEntry ($configEntry, $value=1) {
 	}
 }
 
-// Checks wether the configuration array is set so the config is loaded
+// Checks whether the configuration array is set so the config is loaded
 function isConfigurationLoaded () {
 	// Check all
 	return (isset($GLOBALS['config']['config']));
@@ -181,7 +182,7 @@ function updateOldConfigFile () {
 	copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644);
 
 	// First of all, load the old one!
-	$oldConfig = explode("\n", readFromFile(getPath() . 'inc/config.php'));
+	$oldConfig = explode(chr(10), readFromFile(getPath() . 'inc/config.php'));
 
 	// Now, analyze every entry
 	$done = array();
@@ -218,7 +219,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!');
@@ -271,41 +272,55 @@ 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
 
+	// Default is empty SQL
+	$SQL = '';
+
 	// Do we have multiple entries?
 	if (is_array($entries)) {
 		// Walk through all
-		$all = '';
 		foreach ($entries as $idx => $entry) {
 			// Update mode set?
 			if (!empty($updateMode)) {
 				// Update entry
-				$all .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float) $values[$idx]);
+				$SQL .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float) $values[$idx]);
 			} else {
 				// Check if string or number but no array
 				if (is_array($values[$idx])) {
 					// Arrays must be fixed...
-					debug_report_bug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
-				} elseif (($values[$idx] + 0) === $values[$idx]) {
-					// Number detected
-					$all .= sprintf("`%s`=%s,", $entry, (float) $values[$idx]);
-
-					// Set it in config as well
-					setConfigEntry($entry, $values[$idx]);
+					reportBug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content=<pre>'.print_r($values[$idx], true).'</pre>');
 				} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
 					// Function UNIX_TIMESTAMP() detected
-					$all .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
+					$SQL .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
 
 					// Set timestamp in array as well
 					setConfigEntry($entry, time());
+				} elseif (!empty($updateMode)) {
+					// Is the value zero?
+					if ($values[$idx] == '0') {
+						// Then skip it
+						continue;
+					} // END - if
+
+					// Update mode set
+					// @TODO Call setConfigEntry() somehow
+					$SQL .= $entries = sprintf("`%s`=`%s`%s%s", $entry, $entry, $updateMode, (float) $values[$idx]);
+				} elseif (($values[$idx] + 0) === $values[$idx]) {
+					// Number detected
+					$SQL .= sprintf("`%s`=%s,", $entry, (float) $values[$idx]);
+
+					// Set it in config as well
+					setConfigEntry($entry, $values[$idx]);
 				} else {
 					// String detected
-					$all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx]));
+					$SQL .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx]));
 
 					// Set it in config as well
 					setConfigEntry($entry, $values[$idx]);
@@ -314,35 +329,42 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 		} // END - foreach
 
 		// Remove last comma
-		$entries = substr($all, 0, -1);
+		$SQL = substr($SQL, 0, -1);
 	} elseif (!empty($updateMode)) {
+		// Is the value zero?
+		if ($values == '0') {
+			// Then skip it
+			continue;
+		} // END - if
+
 		// Update mode set
-		$entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float) $values);
+		// @TODO Call setConfigEntry() somehow
+		$SQL = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float) $values);
 	} elseif (($values + 0) === $values) {
 		// Number detected
-		$entries = sprintf("`%s`=%s", $entries, (float) $values);
+		$SQL = sprintf("`%s`=%s", $entries, (float) $values);
 
 		// Set it in config first
 		setConfigEntry($entries, (float) $values);
 	} elseif ($values == 'UNIX_TIMESTAMP()') {
 		// Function UNIX_TIMESTAMP() detected
-		$entries = sprintf("`%s`=UNIX_TIMESTAMP()", $entries);
+		$SQL = sprintf("`%s`=UNIX_TIMESTAMP()", $entries);
 
 		// Set timestamp in array as well
 		setConfigEntry($entries, time());
 	} else {
 		// Regular entry to update
-		$entries = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values));
+		$SQL = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values));
 
 		// Set it in config as well
 		setConfigEntry($entries, SQL_ESCAPE($values));
 	}
 
 	// Run database update
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries);
-	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL);
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$SQL." WHERE `config`=%s LIMIT 1",
 			array(bigintval($config)), __FUNCTION__, __LINE__);
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS());
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL . ',affectedRows=' . SQL_AFFECTEDROWS());
 
 	// Rebuild cache
 	rebuildCache('config', 'config');
@@ -350,7 +372,7 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 
 // Filter for loading configuration
 function FILTER_LOAD_CONFIGURATION ($no = '0') {
-	// Is the value null, fix it :(
+	// Is the value null, it comes from the 'init' filter chain
 	if (is_null($no)) {
 		$no = '0';
 	} // END - if
@@ -360,10 +382,8 @@ function FILTER_LOAD_CONFIGURATION ($no = '0') {
 		// Load config from cache
 		mergeConfig($GLOBALS['cache_array']['config'][$no]);
 
-		// Count cache hits if exists
-		if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) {
-			incrementStatsEntry('cache_hits');
-		} // END - if
+		// Count cache hits 
+		incrementStatsEntry('cache_hits');
 	} elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
 		// Load config from DB
 		$result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`='%s' LIMIT 1",