X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=e86c97ac6eb3c7ca6c98a2bcbc8f830681a4f0d6;hb=e3f273938e4e3b8045853ab4bd746d01fa8ade04;hp=918ce0fb39904e63c5c3edcfd4c974e3569f4cb5;hpb=1c4e78c5d68b97b82a3b930aa6db1e6df188f653;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 918ce0fb39..e86c97ac6e 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -77,12 +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(__FUNCTION__, __LINE__, sprintf("Configuration entry <em>%s</em> is missing.", $configEntry));
+		debug_report_bug(__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];
 }
 
@@ -153,7 +154,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',
@@ -182,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();
@@ -224,7 +225,7 @@ function updateOldConfigFile () {
 
 				/// ... and write it to the new config
 				//* DEBUG: */ debugOutput('function=' . $function . ',new=' . $new . ',comment=' . $comment);
-				changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
+				changeDataInFile(getCachePath() . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", '");', constant($new), 0);
 				//* DEBUG: */ debugOutput('CHANGED!');
 
 				// Mark it as done
@@ -242,7 +243,7 @@ function updateOldConfigFile () {
 		$line = trim($line);
 
 		// Is the $MySQL found?
-		if (substr($line, 0, 6) == "\$MySQL") {
+		if (substr($line, 0, 6) == '$MySQL') {
 			// Okay found!
 			$found = true;
 		} elseif ($found === true) {
@@ -263,12 +264,12 @@ function updateOldConfigFile () {
 			$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());
@@ -277,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 ((isCssOutputMode()) || (isRawOutputMode()) || (isInstallationPhase())) {
 		return;
 	} // END - if
 
@@ -343,10 +344,10 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
 	}
 
 	// Run database update
-	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries}");
+	//* 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: */ logDebugMessage(__FUNCTION__, __LINE__, "entries={$entries},affectedRows={$affectedRows}<br />");
+	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS());
 
 	// Rebuild cache
 	rebuildCache('config', 'config');