X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig-functions.php;h=8f25e9223c51a002747d11f8911c170ceeacf166;hb=e09ef42fa5cc81f733f9c8d1dc741a26f74553ef;hp=5cbb77db720795f2ecd55b8fdcd638274cd0e81f;hpb=a2ca374f65976d21651fffb64a78d3a9678bb3b8;p=mailer.git

diff --git a/inc/config-functions.php b/inc/config-functions.php
index 5cbb77db72..8f25e9223c 100644
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -44,7 +44,7 @@ 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
@@ -62,10 +62,6 @@ function initConfig () {
 		// 'DEBUG_REGEX'         => '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 +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]));
 }
 
@@ -120,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
@@ -354,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?