X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=cc35fc1cbfa47ce4cfaccf333a1b35a03637975f;hb=e7627208baf6669248953b5b07aa67d0724dea75;hp=8f25e9223c51a002747d11f8911c170ceeacf166;hpb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;p=mailer.git
diff --git a/inc/config-functions.php b/inc/config-functions.php
index 8f25e9223c..cc35fc1cbf 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,7 +1,7 @@
0) {
+ if (isConfigEntrySet($configEntry)) {
$GLOBALS['config'][$configEntry] += $value;
} else {
$GLOBALS['config'][$configEntry] = $value;
@@ -201,7 +201,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);
@@ -259,7 +259,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);
@@ -278,7 +278,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;
@@ -298,16 +298,22 @@ function updateConfiguration ($entries, $values, $updateMode='') {
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]);
} 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
@@ -315,19 +321,31 @@ 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__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_config` SET ".$entries." WHERE `config`=%s LIMIT 1",
+ array(bigintval($config)), __FUNCTION__, __LINE__);
//* DEBUG: */ outputHtml(__FUNCTION__."(".__LINE__."):entries={$entries},affectedRows={$affectedRows}
");
// Rebuild cache
@@ -335,15 +353,14 @@ function updateConfiguration ($entries, $values, $updateMode='') {
}
// Filter for loading configuration
-function FILTER_LOAD_CONFIGURATION ($no = 0) {
+function FILTER_LOAD_CONFIGURATION ($no = '0') {
+ // Is the value null, fix it :(
+ if (is_null($no)) $no = '0';
+
// 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
- //* DEBUG: */ outputHtml(gettype($GLOBALS['cache_array']['config'][$no])."
");
mergeConfig($GLOBALS['cache_array']['config'][$no]);
- //foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
- // setConfigEntry($key, $value);
- //} // END - foreach
// Count cache hits if exists
if ((isStatsEntrySet('cache_hits')) && (isExtensionActive('cache'))) {