X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=a7f4ac979404ea5771fc78dea58722b109bafe01;hp=bc3eea007071a28706792fa977eac94d557114af;hb=e8ca54fe91872ab95a6ffdc4f1268bf18889021d;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa
diff --git a/inc/config-functions.php b/inc/config-functions.php
index bc3eea0070..a7f4ac9794 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -14,8 +14,6 @@
* $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 *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -47,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__));
+ 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 +75,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 %s is missing.",
- __FUNCTION__,
- __LINE__,
- $configEntry
- ));
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("Configuration entry %s is missing.", $configEntry));
} // END - if
// Return it
+ //* DEBUG: */ error_log(__FUNCTION__.'['.__LINE__.':] '.$configEntry.'='.$GLOBALS['config'][$configEntry]);
return $GLOBALS['config'][$configEntry];
}
@@ -98,7 +93,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])).'
';
+ //* DEBUG: */ debugOutput(__FUNCTION__.':'.$configEntry.'='.intval(isset($GLOBALS['config'][$configEntry])));
return (isset($GLOBALS['config'][$configEntry]));
}
@@ -157,7 +152,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',
@@ -186,10 +181,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 +197,7 @@ function updateOldConfigFile () {
// Is the line found?
if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
// Entry found!
- //* DEBUG: */ outputHtml(secureString($line) . " - FOUND!
");
+ //* DEBUG: */ debugOutput(secureString($line) . ' - FOUND!');
// Eval the line...
eval($line);
@@ -227,9 +222,9 @@ function updateOldConfigFile () {
} // END - if
/// ... and write it to the new config
- //* DEBUG: */ outputHtml('function=' . $function . ',new=' . $new . ',comment=' . $comment . "
");
- changeDataInFile(getConfig('CACHE_PATH') . 'config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
- //* DEBUG: */ outputHtml("CHANGED!
");
+ //* 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;
@@ -246,7 +241,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) {
@@ -260,19 +255,19 @@ function updateOldConfigFile () {
}
// Debug output only
- //* DEBUG: */ outputHtml(secureString($line) . " - MySQL!
");
+ //* 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 +276,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
@@ -293,15 +288,15 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
// Update mode set?
if (!empty($updateMode)) {
// Update entry
- $all .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float)$values[$idx]);
+ $all .= sprintf("`%s`=`%s`%s%s,", $entry, $entry, $updateMode, (float) $values[$idx]);
} else {
// 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='.print_r($values[$idx], true).'
');
+ debug_report_bug(__FUNCTION__, __LINE__, 'values[' . $idx . '] should not be an array! Content='.print_r($values[$idx], true).'
');
} elseif (($values[$idx] + 0) === $values[$idx]) {
// Number detected
- $all .= sprintf("`%s`=%s,", $entry, (float)$values[$idx]);
+ $all .= sprintf("`%s`=%s,", $entry, (float) $values[$idx]);
// Set it in config as well
setConfigEntry($entry, $values[$idx]);
@@ -325,13 +320,13 @@ function updateConfiguration ($entries, $values, $updateMode='', $config = '0')
$entries = substr($all, 0, -1);
} elseif (!empty($updateMode)) {
// Update mode set
- $entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float)$values);
+ $entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float) $values);
} elseif (($values + 0) === $values) {
// Number detected
- $entries = sprintf("`%s`=%s", $entries, (float)$values);
+ $entries = 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);
@@ -347,10 +342,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}
");
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'entries=' . $entries . ',affectedRows=' . SQL_AFFECTEDROWS());
// Rebuild cache
rebuildCache('config', 'config');