More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 446518563af4851587ea218b24a246efe7a9b225..a31a7879a771721428e0be637e964fa6a8854d27 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,11 +57,17 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
+// Disable block-mode by default
+enableBlockMode(false);
+
+// Init error handler
+initErrorHandler();
+
 // Init request
 initRequest();
 
 // Set important header_sent
-$GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
 
 // Init fatal messages
 initFatalMessages();
@@ -75,8 +81,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();
@@ -87,6 +93,9 @@ if ((!isInstalling()) && (isInstalled())) {
 
                // Is the link valid?
                if (SQL_IS_LINK_UP()) {
+                       // Enable exit on error
+                       enableExitOnError();
+
                        // Is it a valid resource?
                        if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
                                // This is required for extension 'optimize' to work
@@ -119,41 +128,47 @@ 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
-
-                               // 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 ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+
+                               // Check module for permissions
+                               $checkModule = checkModulePermissions(getModule());
+                               if ($checkModule != 'done') {
+                                       // Not fine!
+                                       DEBUG_LOG(__FILE__, __LINE__, sprintf("Check of module %s results in unpexted value: %s",
+                                               getModule(),
+                                               $checkModule
+                                       ));
+                               } // END - if
 
                                // Shall we activate the exchange?
                                if (getConfig('activate_xchange') > 0) activateExchange();
@@ -187,13 +202,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');
@@ -205,7 +220,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
@@ -240,7 +255,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');