X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=55d530bc891be35ce9e0897b023dc88465c4e0ac;hb=541036af17736c5b61b2b4b54fe1a75b57b94d40;hp=bc3eea007071a28706792fa977eac94d557114af;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index bc3eea0070..55d530bc89 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -47,7 +47,7 @@ function initConfig () {
 	// Init not if already found
 	if (isConfigurationLoaded()) {
 		// Already initialized
-		debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
+		debug_report_bug(__FUNCTION__, __LINE__, 'Configuration is already initialized.');
 	} // END - if
 
 	// Set a minimum of configuration, required to by-pass some error triggers in getConfig()
@@ -77,16 +77,13 @@ function getConfig ($configEntry) {
 	$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
-		));
+		debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry <em>%s</em> is missing.", $configEntry));
 	} // END - if
 
 	// Return it
+	//* DEBUG: */ error_log(__FUNCTION__.'['.__LINE__.':] '.$configEntry.'='.$GLOBALS['config'][$configEntry]);
 	return $GLOBALS['config'][$configEntry];
 }
 
@@ -98,7 +95,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 />';
+	//* DEBUG: */ debugOutput(__FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])));
 	return (isset($GLOBALS['config'][$configEntry]));
 }
 
@@ -186,10 +183,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("\n", readFromFile(getPath() . 'inc/config.php'));
 
 	// Now, analyze every entry
 	$done = array();
@@ -202,7 +199,7 @@ function updateOldConfigFile () {
 			// Is the line found?
 			if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
 				// Entry found!
-				//* DEBUG: */ outputHtml(secureString($line) . " - FOUND!<br />");
+				//* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
 
 				// Eval the line...
 				eval($line);
@@ -227,9 +224,9 @@ function updateOldConfigFile () {
 				} // 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 />");
+				//* DEBUG: */ debugOutput('function=' . $function . ',new=' . $new . ',comment=' . $comment);
+				changeDataInFile(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
+				//* DEBUG: */ debugOutput('CHANGED!');
 
 				// Mark it as done
 				$done[$old] = 1;
@@ -260,19 +257,19 @@ function updateOldConfigFile () {
 			}
 
 			// Debug output only
-			//* DEBUG: */ outputHtml(secureString($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);
+			changeDataInFile(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());
@@ -281,7 +278,7 @@ function updateOldConfigFile () {
 // Update config entries
 function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
 	// Do not update config in CSS mode
-	if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
+	if ((getScriptOutputMode() == 1) || (getScriptOutputMode() == -1) || (isInstallationPhase())) {
 		return;
 	} // END - if
 
@@ -298,7 +295,7 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 				// 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>');
+					debug_report_bug(__FUNCTION__, __LINE__, '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]);