X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=03ad13e7acb138763561b1b752ed33c0716a5499;hb=1ba8d9449de1b6fea32e88d581fb7c121b0522b1;hp=4b5152864b8d38321d95f5ab16181ec6169840fd;hpb=f2b603aed42bfdf7a94611d7bae71fe3a1048890;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 4b5152864b..03ad13e7ac 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -58,6 +58,7 @@ function initConfig () {
 		// 'DEBUG_HOURLY'        => 'N',
 		// 'DEBUG_DAILY'         => 'N',
 		// 'DEBUG_MONTHLY'       => 'N',
+		// 'DEBUG_YEARLY'        => 'N',
 		// 'DEBUG_WEEKLY'        => 'N',
 		// 'DEBUG_REGEX'         => 'N',
 		// 'ADMIN_REGISTERED'    => 'N',
@@ -75,7 +76,7 @@ function getConfig ($configEntry) {
 	// Is the entry there?
 	if (!isConfigEntrySet($configEntry)) {
 		// Raise an error of missing entries
-		reportBug(__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
@@ -286,11 +287,11 @@ function updateOldConfigFile () {
 }
 
 // Update config entries
-function updateConfiguration ($entries, $values, $updateMode = '', $config = '0') {
+function updateConfiguration ($entries, $values, $updateMode = '', $config = '0', $force = FALSE) {
 	// Do not update config in CSS mode
-	if ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
+	if (($force === FALSE) && ((isCssOutputMode()) || (isRawOutputMode()) || (isInstaller()))) {
 		// 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()));
+		/* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Not updating configuration. entries[]=' . gettype($entries) . ',values[]=' . gettype($values) . ',updateMode=' . $updateMode . ',config=' . $config . ',isCssOutputMode()=' . intval(isCssOutputMode()) . ',isRawOutputMode()=' . intval(isRawOutputMode()) . ',isInstaller()=' . intval(isInstaller()));
 		return;
 	} // END - if
 
@@ -304,7 +305,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 			// Update mode set?
 			if (!empty($updateMode)) {
 				// Update entry
-				$SQL .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float) $values[$idx]);
+				$SQL .= sprintf("`%s`=`%s`%s%01.5f,", $entry, $entry, $updateMode, (float) $values[$idx]);
 			} else {
 				// Check if string or number but no array
 				if (is_array($values[$idx])) {
@@ -312,7 +313,8 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 					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
-					$SQL .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Function UNIX_TIMESAMP() detected: entry=' . $entry);
+					$SQL .= sprintf('`%s`=UNIX_TIMESTAMP(),', $entry);
 
 					// Set timestamp in array as well
 					setConfigEntry($entry, time());
@@ -325,15 +327,17 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 
 					// Update mode set
 					// @TODO Call setConfigEntry() somehow
-					$SQL .= $entries = sprintf("`%s`=`%s`%s%s", $entry, $entry, $updateMode, (float) $values[$idx]);
+					$SQL .= $entries = sprintf('`%s`=`%s`%s%01.5f', $entry, $entry, $updateMode, (float) $values[$idx]);
 				} elseif (($values[$idx] + 0) === $values[$idx]) {
 					// Number detected
-					$SQL .= sprintf("`%s`=%s,", $entry, (float) $values[$idx]);
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Number detected: entry=' . $entry . ',values[' . $idx . '/' . gettype($values[$idx]) . ']=' . $values[$idx]);
+					$SQL .= sprintf('`%s`=%01.5f,', $entry, (float) $values[$idx]);
 
 					// Set it in config as well
 					setConfigEntry($entry, $values[$idx]);
 				} else {
 					// String detected
+					//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular value detected: entry=' . $entry . ',values[' . $idx . '/' . gettype($values[$idx]) . ']=' . $values[$idx]);
 					$SQL .= sprintf("`%s`='%s',", $entry, sqlEscapeString($values[$idx]));
 
 					// Set it in config as well
@@ -353,21 +357,24 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 
 		// Update mode set
 		// @TODO Call setConfigEntry() somehow
-		$SQL = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float) $values);
-	} elseif (($values + 0) === $values) {
-		// Number detected
-		$SQL = sprintf("`%s`=%s", $entries, (float) $values);
-
-		// Set it in config first
-		setConfigEntry($entries, (float) $values);
+		$SQL = sprintf('`%s`=`%s`%s%01.5f', $entries, $entries, $updateMode, (float) $values);
 	} elseif ($values == 'UNIX_TIMESTAMP()') {
 		// Function UNIX_TIMESTAMP() detected
-		$SQL = sprintf("`%s`=UNIX_TIMESTAMP()", $entries);
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Function UNIX_TIMESAMP() detected: entries=' . $entries);
+		$SQL = sprintf('`%s`=UNIX_TIMESTAMP()', $entries);
 
 		// Set timestamp in array as well
 		setConfigEntry($entries, time());
+	} elseif (($values + 0) === $values) {
+		// Number detected
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Number detected: entries=' . $entries . ',values[' . gettype($values) . ']=' . $values);
+		$SQL = sprintf('`%s`=%01.5f', $entries, (float) $values);
+
+		// Set it in config first
+		setConfigEntry($entries, (float) $values);
 	} else {
 		// Regular entry to update
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Regular value detected: entries=' . $entries . ',values[' . gettype($values) . ']=' . $values);
 		$SQL = sprintf("`%s`='%s'", $entries, sqlEscapeString($values));
 
 		// Set it in config as well
@@ -376,7 +383,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 
 	// Run database update
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL);
-	sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$SQL." WHERE `config`=%s LIMIT 1",
+	sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_config` SET ' . $SQL . ' WHERE `config`=%s LIMIT 1',
 			array(bigintval($config)), __FUNCTION__, __LINE__);
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL . ',affectedRows=' . sqlAffectedRows());
 
@@ -387,7 +394,7 @@ function updateConfiguration ($entries, $values, $updateMode = '', $config = '0'
 // Filter for loading configuration
 function FILTER_LOAD_CONFIGURATION ($no = '0') {
 	// Is installation phase?
-	if (isInstallationPhase()) {
+	if (isInstaller()) {
 		// Then don't load any configuration
 		return;
 	} // END - if
@@ -406,7 +413,7 @@ function FILTER_LOAD_CONFIGURATION ($no = '0') {
 		incrementStatsEntry('cache_hits');
 	} elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) {
 		// Load config from DB
-		$result_config = sqlQueryEscaped("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`='%s' LIMIT 1",
+		$result_config = sqlQueryEscaped('SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`=%s LIMIT 1',
 			array(bigintval($no)), __FUNCTION__, __LINE__);
 
 		// Is the config there?