X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=bc3eea007071a28706792fa977eac94d557114af;hb=be3bcf24cbb7277998a5c149308c9fb644c13ef5;hp=5cbb77db720795f2ecd55b8fdcd638274cd0e81f;hpb=a2ca374f65976d21651fffb64a78d3a9678bb3b8;p=mailer.git
diff --git a/inc/config-functions.php b/inc/config-functions.php
index 5cbb77db72..bc3eea0070 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,7 +1,7 @@
'N',
// 'ADMIN_REGISTERED' => 'N',
// 'verbose_sql' => 'Y',
- // 'ENABLE_BACKLINK' => 'Y',
- // 'display_debug_sqls' => 'N',
- // Keep session_save_path to fall-back to php.ini setting
- // 'session_save_path' => '',
// For installation phase:
'SMTP_HOSTNAME' => '',
'SMTP_USER' => '',
@@ -101,6 +98,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])).'
';
return (isset($GLOBALS['config'][$configEntry]));
}
@@ -112,7 +110,7 @@ function mergeConfig ($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
- if (getConfig($configEntry) > 0) {
+ if (isConfigEntrySet($configEntry)) {
$GLOBALS['config'][$configEntry] += $value;
} else {
$GLOBALS['config'][$configEntry] = $value;
@@ -120,18 +118,18 @@ function incrementConfigEntry ($configEntry, $value=1) {
}
// Checks wether the configuration array is set so the config is loaded
-function isConfigLoaded () {
+function isConfigurationLoaded () {
// Check all
- return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0));
+ return (isset($GLOBALS['config']['config']));
}
// Getter for whole $GLOBALS['config'] array
function getConfigArray () {
// Default is null
- $return = null;
+ $return = array();
// Is the config set?
- if (isConfigLoaded()) {
+ if (isset($GLOBALS['config'])) {
// Then use it
$return = $GLOBALS['config'];
} // END - if
@@ -204,7 +202,7 @@ function updateOldConfigFile () {
// Is the line found?
if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
// Entry found!
- //* DEBUG: */ outputHtml(htmlentities($line) . " - FOUND!
");
+ //* DEBUG: */ outputHtml(secureString($line) . " - FOUND!
");
// Eval the line...
eval($line);
@@ -262,7 +260,7 @@ function updateOldConfigFile () {
}
// Debug output only
- //* DEBUG: */ outputHtml(htmlentities($line) . " - MySQL!
");
+ //* DEBUG: */ outputHtml(secureString($line) . " - MySQL!
");
// Split parts so we can check them and prepare them
$parts = explode('=>', $line);
@@ -281,7 +279,7 @@ function updateOldConfigFile () {
}
// Update config entries
-function updateConfiguration ($entries, $values, $updateMode='') {
+function updateConfiguration ($entries, $values, $updateMode='', $config = '0') {
// Do not update config in CSS mode
if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
return;
@@ -297,20 +295,29 @@ function updateConfiguration ($entries, $values, $updateMode='') {
// 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=
'.print_r($values[$idx], true).''); + } elseif (($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]); } elseif ($values[$idx] == 'UNIX_TIMESTAMP()') { // Function UNIX_TIMESTAMP() detected - $all .= sprintf("`%s`=%s,", $entry, $values[$idx]); + $all .= sprintf("`%s`=UNIX_TIMESTAMP(),", $entry); + + // Set timestamp in array as well + setConfigEntry($entry, time()); } else { // String detected $all .= sprintf("`%s`='%s',", $entry, SQL_ESCAPE($values[$idx])); - } - // Set it in config as well - setConfigEntry($entry, $values[$idx]); + // Set it in config as well + setConfigEntry($entry, $values[$idx]); + } } } // END - foreach @@ -318,35 +325,46 @@ function updateConfiguration ($entries, $values, $updateMode='') { $entries = substr($all, 0, -1); } elseif (!empty($updateMode)) { // Update mode set - // @TODO Find a way for updating configuration here - $entries .= sprintf("=%s%s%s", $entries, $updateMode, (float)$values); - } else { + $entries = sprintf("`%s`=`%s`%s%s", $entries, $entries, $updateMode, (float)$values); + } elseif (($values + 0) === $values) { + // Number detected + $entries = sprintf("`%s`=%s", $entries, (float)$values); + // Set it in config first - setConfigEntry($entries, $values); + setConfigEntry($entries, (float)$values); + } elseif ($values == 'UNIX_TIMESTAMP()') { + // Function UNIX_TIMESTAMP() detected + $entries = sprintf("`%s`=UNIX_TIMESTAMP()", $entries); + // Set timestamp in array as well + setConfigEntry($entries, time()); + } else { // Regular entry to update - $entries .= sprintf("='%s'", SQL_ESCAPE($values)); + $entries = 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("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=0 LIMIT 1", __FUNCTION__, __LINE__); - //* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}