More missing config entries added

[mailer.git] / inc / config-functions.php

diff --git a/inc/config-functions.php b/inc/config-functions.php
index c15828ad8f04eef15f1ed6c699eec2030c3e937e..db769c06e400bf795772b47c69c9b4e720b20702 100644 (file)
--- a/inc/config-functions.php
+++ b/inc/config-functions.php
@@ -42,33 +42,47 @@ if (!defined('__SECURITY')) {
        require($INC);
 }
 
-// Merges $_CONFIG with data in given array
-function mergeConfig ($newConfig) {
-       global $_CONFIG;
-       $_CONFIG = merge_array(getConfigArray(), $newConfig);
+// Init the config array
+function initConfig () {
+       // Init not if already found
+       if ((isset($GLOBALS['config'])) && (count($GLOBALS['config']) >= 3)) {
+               // Already initialized
+               trigger_error(sprintf("[%s:%s] Configuration is already initialized.", __FUNCTION__, __LINE__));
+       } // END - if
+
+       // Set a minimum dummy configuration
+       $GLOBALS['config'] = array(
+               'code_length'   => 0,
+               'patch_level'   => 0,
+               'last_update'   => time(),
+               'DEBUG_MODE'    => 'N',
+               'DEBUG_RESET'   => 'N',
+               'DEBUG_MONTHLY' => 'N',
+               'DEBUG_WEEKLY'  => 'N',
+               'DEBUG_REGEX'   => 'N',
+               'sql_count'     => 0,
+               'num_templates' => 0,
+               'default_theme' => 'default',
+       );
 }
 
-// Getter for $_CONFIG entries
+// Getter for $GLOBALS['config'] entries
 function getConfig ($configEntry) {
-       global $_CONFIG;
-
        // Default value
        $value = null;
 
        // Is the entry there?
-       if (isConfigEntrySet($configEntry)) {
-               // Then use it
-               $value = $_CONFIG[$configEntry];
+       if (!isConfigEntrySet($configEntry)) {
+               // Raise an error of missing entries
+               trigger_error(sprintf("[%s:%s] Configuration entry <em>%s</em> is missing.", __FUNCTION__, __LINE__, $configEntry));
        } // END - if
 
        // Return it
-       return $value;
+       return $GLOBALS['config'][$configEntry];
 }
 
-// Setter for $_CONFIG entries
+// Setter for $GLOBALS['config'] entries
 function setConfigEntry ($configEntry, $value) {
-       global $_CONFIG;
-
        // Secure the entry name
        if (function_exists('SQL_ESCAPE')) {
                // Use our secure function
@@ -78,52 +92,34 @@ function setConfigEntry ($configEntry, $value) {
                $configEntry = smartAddSlashes($configEntry);
        }
 
-       // If config array isn't set, set it
-       if (!isConfigLoaded()) {
-               // Init configuration array
-               initConfig();
-       } // END - if
-
        // And set it
-       $_CONFIG[$configEntry] = $value;
+       $GLOBALS['config'][$configEntry] = $value;
 }
 
 // Checks wether the given config entry is set
 function isConfigEntrySet ($configEntry) {
-       global $_CONFIG;
-       return (isset($_CONFIG[$configEntry]));
+       return (isset($GLOBALS['config'][$configEntry]));
+}
+
+// Merges $GLOBALS['config'] with data in given array
+function mergeConfig ($newConfig) {
+       $GLOBALS['config'] = merge_array(getConfigArray(), $newConfig);
 }
 
 // Increment or init with given value or 1 as default the given config entry
 function incrementConfigEntry ($configEntry, $value=1) {
-       global $_CONFIG;
-
        // Increment it if set or init it with 1
        if (getConfig($configEntry) > 0) {
-               $_CONFIG[$configEntry] += $value;
+               $GLOBALS['config'][$configEntry] += $value;
        } else {
-               $_CONFIG[$configEntry] = $value;
+               $GLOBALS['config'][$configEntry] = $value;
        }
 }
 
 // Checks wether the configuration array is set so the config is loaded
 function isConfigLoaded () {
-       global $_CONFIG;
-
        // Check all
-       return ((isset($_CONFIG)) && (is_array($_CONFIG)) && (count($_CONFIG) > 0));
-}
-
-// Init the config array
-function initConfig () {
-       global $_CONFIG;
-
-       // Set a minimum dummy configuration
-       $_CONFIG = array(
-               'code_length' => 0,
-               'patch_level' => 0,
-               'last_update' => time()
-       );
+       return ((isset($GLOBALS['config'])) && (is_array($GLOBALS['config'])) && (count($GLOBALS['config']) > 0));
 }
 
 // Load configuration and return it as an arry
@@ -131,7 +127,7 @@ function loadConfiguration ($no = '0') {
        // Check for cache extension, cache-array and if the requested configuration is in cache
        if ((isset($GLOBALS['cache_array'])) && (is_array($GLOBALS['cache_array'])) && (isset($GLOBALS['cache_array']['config'][$no])) && (is_array($GLOBALS['cache_array']['config'][$no]))) {
                // Load config from cache
-               //* DEBUG: */ echo gettype($GLOBALS['cache_array']['config'][$no])."<br />\n";
+               //* DEBUG: */ OUTPUT_HTML(gettype($GLOBALS['cache_array']['config'][$no])."<br />");
                foreach ($GLOBALS['cache_array']['config'][$no] as $key => $value) {
                        setConfigEntry($key, $value);
                } // END - foreach
@@ -159,17 +155,15 @@ function loadConfiguration ($no = '0') {
        }
 }
 
-// Getter for whole $_CONFIG array
+// Getter for whole $GLOBALS['config'] array
 function getConfigArray () {
-       global $_CONFIG;
-
        // Default is null
        $return = null;
 
        // Is the config set?
        if (isConfigLoaded()) {
                // Then use it
-               $return = $_CONFIG;
+               $return = $GLOBALS['config'];
        } // END - if
 
        // Return result
@@ -236,7 +230,7 @@ function updateOldConfigFile () {
                        // Is the line found?
                        if ((substr($line, 0, strlen($old)) == $old) && (!isset($done[$old]))) {
                                // Entry found!
-                               //* DEBUG: */ print htmlentities($line) . " - FOUND!<br />\n";
+                               //* DEBUG: */ OUTPUT_HTML(htmlentities($line) . " - FOUND!<br />");
 
                                // Eval the line...
                                eval($line);
@@ -267,9 +261,9 @@ function updateOldConfigFile () {
                                } // END - if
 
                                /// ... and write it to the new config
-                               //* DEBUG: */ print 'function=' . $function . ',new=' . $new . ',comment=' . $comment . "<br />\n";
+                               //* DEBUG: */ OUTPUT_HTML('function=' . $function . ',new=' . $new . ',comment=' . $comment . "<br />");
                                changeDataInFile(constant('PATH') . 'inc/cache/config-local.php', $comment, $function . "('" . $oldNew . "', \"", "\");", constant($new), 0);
-                               //* DEBUG: */ print "CHANGED!<br />\n";
+                               //* DEBUG: */ OUTPUT_HTML("CHANGED!<br />");
 
                                // Mark it as done
                                $done[$old] = 1;
@@ -300,7 +294,7 @@ function updateOldConfigFile () {
                        }
 
                        // Debug output only
-                       //* DEBUG: */ print htmlentities($line) . " - MySQL!<br />\n";
+                       //* DEBUG: */ OUTPUT_HTML(htmlentities($line) . " - MySQL!<br />");
 
                        // Split parts so we can check them and prepare them
                        $parts = explode('=>', $line);