X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=cc35fc1cbfa47ce4cfaccf333a1b35a03637975f;hb=d52beaaad0b8388fec7f9f3cece88ef98a833751;hp=cda835e7752a9f1ae7ca72392600dc3e5a721e6f;hpb=82ba828dcdb063ea3292fad79008469d6423d223;p=mailer.git
diff --git a/inc/config-functions.php b/inc/config-functions.php
index cda835e775..cc35fc1cbf 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -1,7 +1,7 @@
");
+ //* 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;
@@ -344,7 +344,8 @@ function updateConfiguration ($entries, $values, $updateMode='') {
// 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
@@ -352,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'))) {