X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=656501db5dfb622dc588bc129619bb5e0c825919;hp=fd29373344d66379df08aeea07eb6577c39f2ecd;hb=8fc1c99d323e7599dd91071a5a772261b5d079a7;hpb=24ef7d15f6d464e570781cfff1bebe852260835a

diff --git a/inc/config-functions.php b/inc/config-functions.php
index fd29373344..656501db5d 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/28/2009 *
- * ===============                              Last change: 02/28/2009 *
+ * Mailer v0.2.1-FINAL                                Start: 02/28/2009 *
+ * ===================                          Last change: 02/28/2009 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : config-functions.php                             *
@@ -97,6 +97,7 @@ function setConfigEntry ($configEntry, $value) {
 
 // Checks wether the given config entry is set
 function isConfigEntrySet ($configEntry) {
+	//* DEBUG: */ print __FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])).'<br />';
 	return (isset($GLOBALS['config'][$configEntry]));
 }
 
@@ -108,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;
@@ -200,7 +201,7 @@ function updateOldConfigFile () {
 			// Is the line found?
 			if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
 				// Entry found!
-				//* DEBUG: */ outputHtml(htmlentities($line) . " - FOUND!<br />");
+				//* DEBUG: */ outputHtml(secureString($line) . " - FOUND!<br />");
 
 				// Eval the line...
 				eval($line);
@@ -258,7 +259,7 @@ function updateOldConfigFile () {
 			}
 
 			// Debug output only
-			//* DEBUG: */ outputHtml(htmlentities($line) . " - MySQL!<br />");
+			//* DEBUG: */ outputHtml(secureString($line) . " - MySQL!<br />");
 
 			// Split parts so we can check them and prepare them
 			$parts = explode('=>', $line);
@@ -277,7 +278,7 @@ function updateOldConfigFile () {
 }
 
 // Update config entries
-function updateConfiguration ($entries, $values, $updateMode='') {
+function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
 	// Do not update config in CSS mode
 	if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
 		return;
@@ -293,20 +294,29 @@ function updateConfiguration ($entries, $values, $updateMode='') {
 				// Update entry
 				$all .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
 			} else {
-				// Check if string or number
-				if (($values[$idx] + 0) === $values[$idx]) {
+				// Check if string or number but no array
+				if (is_array($values[$idx])) {
+					// Arrays must be fixed...
+					debug_report_bug('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]);
 				} 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
 
@@ -314,35 +324,46 @@ 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
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}");
-	SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=0 LIMIT 1", __FUNCTION__, __LINE__);
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />");
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
+			array(bigintval($config)), __FUNCTION__, __LINE__);
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries},affectedRows={$affectedRows}<br />");
 
 	// Rebuild cache
-	rebuildCacheFile('config', 'config');
+	rebuildCache('config', 'config');
 }
 
 // Filter for loading configuration
-function FILTER_LOAD_CONFIGURATION ($no = 0) {
+function FILTER_LOAD_CONFIGURATION ($no = '0') {
+	// Is the value null, fix it :(
+	if (is_null($no)) $no = '0';
+
 	// 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]))) {
 		// Load config from cache
-		//* DEBUG: */ outputHtml(gettype($GLOBALS['cache_array']['config'][$no])."<br />");
 		mergeConfig($GLOBALS['cache_array']['config'][$no]);
-		//foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
-		//	setConfigEntry($key, $value);
-		//} // END - foreach
 
 		// Count cache hits if exists
 		if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) {