X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=656501db5dfb622dc588bc129619bb5e0c825919;hp=881b7f63d8c9359184542915cf0002cc2aeffa20;hb=325bb973c136c921d0c36384ca9655aa7744283e;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 881b7f63d8..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                             *
@@ -201,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);
@@ -259,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);
@@ -294,8 +294,11 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 				// 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]);
 
@@ -346,22 +349,21 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}");
 	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
 			array(bigintval($config)), __FUNCTION__, __LINE__);
-	//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />");
+	//* 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') {
+	// 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'))) {