'what','action','module' and 'output_mode' wrapped into functions (WARNUNG: Code...

[mailer.git] / inc / mysql-connect.php

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 5ad12fcb5d8f163413c9f72ee902cc89cf5fe141..91dc03e9e2bd6163f8f5c75467f20daae2b39560 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -78,8 +78,8 @@ if ((!isInstalling()) && (isInstalled())) {
        loadIncludeOnce('inc/load_config.php');
 
        // Check for write-permission for config.php and inc directory
-       if (empty($GLOBALS['module'])) $GLOBALS['module'] = REQUEST_GET('module');
-       if (empty($GLOBALS['module'])) $GLOBALS['module'] = 'index';
+       if (!isModuleSet()) setModule(REQUEST_GET('module'));
+       if (!isModuleSet()) setModule('index');
 
        // CSS array
        EXT_INIT_CSS_FILES();
@@ -125,41 +125,41 @@ if ((!isInstalling()) && (isInstalled())) {
                                //* DEBUG: */ die();
 
                                // Get all values
-                               if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
-                                       if (empty($GLOBALS['module']))  $GLOBALS['module'] = 'empty';
-                                       if (empty($GLOBALS['what']))    $GLOBALS['what']   = getWhatFromModule($GLOBALS['module']);
-                                       if (empty($GLOBALS['action']))  $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
+                               if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+                                       if (!isModuleSet())  setModule('empty');
+                                       if (!isWhatSet())    setWhat(getWhatFromModule(getModule()));
+                                       if (!isActionSet())  setAction(getModeAction(getModule(), getWhat()));
                                } else {
                                        // Set action/what to empty
-                                       $GLOBALS['action'] = '';
-                                       $GLOBALS['what']   = '';
+                                       setAction('');
+                                       setWhat('');
                                }
 
                                // Run the init filter chain
                                runFilterChain('init');
 
                                // Set default 'what' value
-                               //* DEBUG: */ OUTPUT_HTML('-'.$GLOBALS['module'].'/'.$GLOBALS['what']."-<br />");
-                               if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
-                                       if ($GLOBALS['module'] == 'admin') {
+                               //* DEBUG: */ OUTPUT_HTML('-'.getModule().'/'.getWhat()."-<br />");
+                               if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+                                       if (getModule() == 'admin') {
                                                // Set 'action' value to 'login' in admin menu
-                                               $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
-                                       } elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
+                                               setAction(getModeAction(getModule(), getWhat()));
+                                       } elseif ((getModule() == 'index') || (getModule() == 'login')) {
                                                // Set 'what' value to 'welcome' in guest and member menu
-                                               $GLOBALS['what'] = 'welcome';
-                                               if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
+                                               setWhat('welcome');
+                                               if (getConfig('index_home') != '') setWhatFromConfig('index_home');
                                        } else {
                                                // Anything else like begging link
-                                               $GLOBALS['what'] = '';
+                                               setWhat('');
                                        }
                                } // END - if
 
                                // Update sending pool
-                               if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+                               if ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
-                               if (checkModulePermissions($GLOBALS['module']) == 'done') countModuleHit($GLOBALS['module']);
+                               if (checkModulePermissions(getModule()) == 'done') countModuleHit(getModule());
 
                                // Shall we activate the exchange?
                                if (getConfig('activate_xchange') > 0) activateExchange();
@@ -193,13 +193,13 @@ if ((!isInstalling()) && (isInstalled())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if ($GLOBALS['output_mode'] == '1') {
+       if (getOutputMode() == '1') {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
        // Set other missing variables
-       if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
+       if (!isOutputModeSet()) setOutputMode('0');
 
        // Include databases.php
        loadIncludeOnce('inc/databases.php');
@@ -211,7 +211,7 @@ if ((!isInstalling()) && (isInstalled())) {
        loadIncludeOnce('inc/versions.php');
 
        // Check if we are in installation routine
-       if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
+       if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
                // Redirect to the installation system
                redirectToUrl('install.php');
        } // END - if
@@ -246,7 +246,7 @@ loadIncludeOnce('inc/session.php');
 // Load versions
 loadIncludeOnce('inc/versions.php');
 
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && (getOutputMode() != '1')) {
        // One or more fatal error(s) occur during connect...
        loadIncludeOnce('inc/header.php');
        loadIncludeOnce('inc/fatal_errors.php');