X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=8f25e9223c51a002747d11f8911c170ceeacf166;hp=d7c27d8171a65696ae5ae151aca6efafe120b31c;hb=6aa5b6c3d7c49ceb5a41b836657321e9c0b5dea5;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/config-functions.php b/inc/config-functions.php
index d7c27d8171..8f25e9223c 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -44,38 +44,24 @@ if (!defined('__SECURITY')) {
 // Init the config array
 function initConfig () {
 	// Init not if already found
-	if (isConfigLoaded()) {
+	if (isConfigurationLoaded()) {
 		// Already initialized
 		debug_report_bug(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
 	} // END - if
 
 	// Set a minimum of configuration, required to by-pass some error triggers in getConfig()
 	$GLOBALS['config'] = array(
-		'code_length'         => 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 +97,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])).'<br />';
 	return (isset($GLOBALS['config'][$configEntry]));
 }
 
@@ -130,18 +117,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
@@ -293,7 +280,7 @@ function updateOldConfigFile () {
 // Update config entries
 function updateConfiguration ($entries, $values, $updateMode='') {
 	// Do not update config in CSS mode
-	if ((getOutputMode() == '1') || (getOutputMode() == -1) || (isInstallationPhase())) {
+	if ((getOutputMode() == 1) || (getOutputMode() == -1) || (isInstallationPhase())) {
 		return;
 	} // END - if
 
@@ -348,7 +335,7 @@ function updateConfiguration ($entries, $values, $updateMode='') {
 }
 
 // Filter for loading configuration
-function FILTER_LOAD_CONFIGURATION ($no = '0') {
+function FILTER_LOAD_CONFIGURATION ($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
@@ -364,7 +351,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?