X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=cda835e7752a9f1ae7ca72392600dc3e5a721e6f;hb=3e429bc72276003273046a3d903261b97ac51307;hp=8f25e9223c51a002747d11f8911c170ceeacf166;hpb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 8f25e9223c..cda835e775 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -109,7 +109,7 @@ function mergeConfig ($newConfig) {
 // 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
-	if (getConfig($configEntry) > 0) {
+	if (isConfigEntrySet($configEntry)) {
 		$GLOBALS['config'][$configEntry] += $value;
 	} else {
 		$GLOBALS['config'][$configEntry] = $value;
@@ -298,16 +298,22 @@ function updateConfiguration ($entries, $values, $updateMode='') {
 				if (($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]);
 				} elseif ($values[$idx] == 'UNIX_TIMESTAMP()') {
 					// Function UNIX_TIMESTAMP() detected
-					$all .= sprintf("`%s`=%s,", $entry, $values[$idx]);
+					$all .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry);
+
+					// Set timestamp in array as well
+					setConfigEntry($entry, time());
 				} else {
 					// String detected
 					$all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx]));
-				}
 
-				// Set it in config as well
-				setConfigEntry($entry, $values[$idx]);
+					// Set it in config as well
+					setConfigEntry($entry, $values[$idx]);
+				}
 			}
 		} // END - foreach
 
@@ -315,14 +321,25 @@ function updateConfiguration ($entries, $values, $updateMode='') {
 		$entries = substr($all, 0, -1);
 	} elseif (!empty($updateMode)) {
 		// Update mode set
-		// @TODO Find a way for updating configuration here
-		$entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values);
-	} else {
+		$entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float)$values);
+	} elseif (($values + 0) === $values) {
+		// Number detected
+		$entries = sprintf("`%s`=%s", $entries, (float)$values);
+
 		// Set it in config first
-		setConfigEntry($entries, $values);
+		setConfigEntry($entries, (float)$values);
+	} elseif ($values == 'UNIX_TIMESTAMP()') {
+		// Function UNIX_TIMESTAMP() detected
+		$entries = sprintf("`%s`=UNIX_TIMESTAMP()", $entries);
 
+		// Set timestamp in array as well
+		setConfigEntry($entries, time());
+	} else {
 		// Regular entry to update
-		$entries .= sprintf("='%s'", SQL_ESCAPE($values));
+		$entries = sprintf("`%s`='%s'", $entries, SQL_ESCAPE($values));
+
+		// Set it in config as well
+		setConfigEntry($entries, SQL_ESCAPE($values));
 	}
 
 	// Run database update