X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=bc3eea007071a28706792fa977eac94d557114af;hp=d7c27d8171a65696ae5ae151aca6efafe120b31c;hb=25b4a580b4c7e0d429eb8e436785d3c2ef304f8e;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e diff --git a/inc/config-functions.php b/inc/config-functions.php index d7c27d8171..bc3eea0070 100644 --- a/inc/config-functions.php +++ b/inc/config-functions.php @@ -1,7 +1,7 @@ 0, - 'patch_level' => 0, - 'last_update' => time(), - 'activate_xchange' => 100, - 'enable_mod_title' => 'Y', - 'update_filter_usage' => 'N', - 'ADMIN_REGISTERED' => 'N', - 'MXCHANGE_INSTALLED' => 'N', - 'DEFAULT_LANG' => 'de', - 'DEBUG_MODE' => 'N', - 'DEBUG_RESET' => 'N', - 'DEBUG_MONTHLY' => 'N', - 'DEBUG_WEEKLY' => 'N', - 'DEBUG_REGEX' => 'N', - 'ADMIN_REGISTERED' => 'N', - 'sql_count' => 0, 'sql_time' => 0, + 'sql_count' => 0, 'num_templates' => 0, - 'default_theme' => 'default', - 'verbose_sql' => 'Y', - 'def_refid' => 0, - 'ENABLE_BACKLINK' => 'Y', - 'display_debug_sqls' => 'N', - // Keep session_save_path to fall-back to php.ini setting - 'session_save_path' => '', + // 'DEFAULT_SALT_LENGTH' => 40, + // 'DEBUG_MODE' => 'N', + // 'DEBUG_RESET' => 'N', + // 'DEBUG_MONTHLY' => 'N', + // 'DEBUG_WEEKLY' => 'N', + // 'DEBUG_REGEX' => 'N', + // 'ADMIN_REGISTERED' => 'N', + // 'verbose_sql' => 'Y', // For installation phase: 'SMTP_HOSTNAME' => '', 'SMTP_USER' => '', @@ -111,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])); } @@ -122,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; @@ -130,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 @@ -214,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); @@ -272,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); @@ -291,9 +279,9 @@ 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())) { + if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) { return; } // END - if @@ -307,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 @@ -328,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}
"); + 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}
"); // Rebuild cache - rebuildCacheFile('config', 'config'); + rebuildCache('config', 'config'); } // Filter for loading configuration 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'))) { @@ -364,7 +372,7 @@ function FILTER_LOAD_CONFIGURATION ($no = '0') { } // END - if } elseif ((!isExtensionActive('cache')) || (!isset($GLOBALS['cache_array']['config'][$no]))) { // Load config from DB - $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE config=%d LIMIT 1", + $result_config = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_config` WHERE `config`='%s' LIMIT 1", array(bigintval($no)), __FUNCTION__, __LINE__); // Is the config there?