X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=84f442bb553ff2ce1eda957eb2ea5434d508ec50;hb=e630d445a4a8ecae2b6f5ea442c2949234dd952a;hp=694a53eb639071f9f1010524ff658d073c899fa4;hpb=fbcdb4e1f8ae0591ad9165b2db18b3c354c29a5b;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 694a53eb63..84f442bb55 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,24 +1,23 @@
 <?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                             *
  * -------------------------------------------------------------------- *
- * Short description : Many non-MySQL functions (also file access)      *
+ * Short description : Configuration functions                          *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : Viele Nicht-MySQL-Funktionen (auch Dateizugriff) *
+ * Kurzbeschreibung  : Konfigurationsfunktionen                         *
  * -------------------------------------------------------------------- *
  * $Revision::                                                        $ *
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * 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 *
@@ -46,7 +45,7 @@ function initConfig () {
 	// Init not if already found
 	if (isConfigurationLoaded()) {
 		// Already initialized
-		debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
+		reportBug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
 	} // END - if
 
 	// Set a minimum of configuration, required to by-pass some error triggers in getConfig()
@@ -72,20 +71,14 @@ function initConfig () {
 
 // Getter for $GLOBALS['config'] entries
 function getConfig ($configEntry) {
-	// Default value
-	$value = null;
-
 	// Is the entry there?
-	if (!isset($GLOBALS['config'][$configEntry])) {
+	if (!isConfigEntrySet($configEntry)) {
 		// Raise an error of missing entries
-		debug_report_bug(sprintf("[%s:%s] Configuration entry <em>%s</em> is missing.",
-			__FUNCTION__,
-			__LINE__,
-			$configEntry
-		));
+		reportBug(__FUNCTION__, __LINE__, sprintf("Configuration entry <span class=\"data\">%s</span> is missing.", $configEntry));
 	} // END - if
 
 	// Return it
+	//* DEBUG: */ error_log(__FUNCTION__.'['.__LINE__.':] '.$configEntry.'='.$GLOBALS['config'][$configEntry]);
 	return $GLOBALS['config'][$configEntry];
 }
 
@@ -95,20 +88,21 @@ 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: */ print __FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])).'<br />';
-	return (isset($GLOBALS['config'][$configEntry]));
+	//* DEBUG: */ debugOutput(__FUNCTION__ . ':' . $configEntry . '=' . intval(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);
 }
 
 // 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
+	// Increment it if set or init it with $value
 	if (isConfigEntrySet($configEntry)) {
 		$GLOBALS['config'][$configEntry] += $value;
 	} else {
@@ -116,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']));
@@ -156,7 +150,7 @@ function updateOldConfigFile () {
 		'_TABLE_TYPE'        => '_TABLE_TYPE',
 		'_DB_TYPE'           => '_DB_TYPE',
 		'SMTP_HOSTNAME'      => 'SMTP_HOSTNAME',
-		'SMTP_USER'           => 'SMTP_USER',
+		'SMTP_USER'          => 'SMTP_USER',
 		'SMTP_PASSWORD'      => 'SMTP_PASSWORD',
 		'ENABLE_BACKLINK'    => 'ENABLE_BACKLINK',
 		'MAIN_TITLE'         => 'MAIN_TITLE',
@@ -185,10 +179,10 @@ function updateOldConfigFile () {
 	);
 
 	// Copy template to new file destionation
-	copyFileVerified(getConfig('PATH') . 'inc/config-local.php.dist', getConfig('CACHE_PATH') . 'config-local.php', 0644);
+	copyFileVerified(getPath() . 'inc/config-local.php.dist', getCachePath() . 'config-local.php', 0644);
 
 	// First of all, load the old one!
-	$oldConfig = explode("\n", readFromFile(getConfig('PATH') . 'inc/config.php'));
+	$oldConfig = explode(chr(10), readFromFile(getPath() . 'inc/config.php'));
 
 	// Now, analyze every entry
 	$done = array();
@@ -200,8 +194,8 @@ function updateOldConfigFile () {
 
 			// Is the line found?
 			if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
-				// Entry found!
-				//* DEBUG: */ outputHtml(htmlentities($line) . " - FOUND!<br />");
+				// Entry found
+				//* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
 
 				// Eval the line...
 				eval($line);
@@ -225,10 +219,10 @@ function updateOldConfigFile () {
 					$new = strtolower($new);
 				} // END - if
 
-				/// ... and write it to the new config
-				//* DEBUG: */ outputHtml('function=' . $function . ',new=' . $new . ',comment=' . $comment . "<br />");
-				changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
-				//* DEBUG: */ outputHtml("CHANGED!<br />");
+				// ... 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!');
 
 				// Mark it as done
 				$done[$old] = 1;
@@ -245,8 +239,8 @@ function updateOldConfigFile () {
 		$line = trim($line);
 
 		// Is the $MySQL found?
-		if (substr($line, 0, 6) == "\$MySQL") {
-			// Okay found!
+		if (substr($line, 0, 6) == '$MySQL') {
+			// Okay, found
 			$found = true;
 		} elseif ($found === true) {
 			// Now check this row
@@ -259,57 +253,74 @@ function updateOldConfigFile () {
 			}
 
 			// Debug output only
-			//* DEBUG: */ outputHtml(htmlentities($line) . " - MySQL!<br />");
+			//* DEBUG: */ debugOutput(secureString($line) . ' - MySQL!');
 
 			// Split parts so we can check them and prepare them
 			$parts = explode('=>', $line);
 			$key = substr(trim($parts[0]), 1, -1); $value = substr(trim($parts[1]), 1, -2);
 
 			// We can now save the right part in new config file
-			changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comments[$key], "	'".$key."'     => \"", "\",", $value, 0);
+			changeDataInInclude(getCachePath() . 'config-local.php', $comments[$key], "	'".$key."'     => \"", '",', $value, 0);
 		}
 	} // END - foreach
 
 	// Finally remove old config file
-	removeFile(getConfig('PATH') . 'inc/config.php');
+	removeFile(getPath() . 'inc/config.php');
 
 	// Redirect to same URL to reload our new config
 	redirectToUrl(getRequestUri());
 }
 
 // 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 ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
+	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
-				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]);
+				// Check if string or number but no array
+				if (is_array($values[$idx])) {
+					// Arrays must be fixed...
+					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]);
@@ -318,54 +329,61 @@ 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);
+		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: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):entries={$entries},affectedRows={$affectedRows}<br />");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'SQL=' . $SQL . ',affectedRows=' . SQL_AFFECTEDROWS());
 
 	// 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';
+	// Is the value null, it comes from the 'init' filter chain
+	if (is_null($no)) {
+		$no = '0';
+	} // END - if
 
 	// 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
 		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",