Several kinky code smoothed, fixes for admin login

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 2a325ccc921c0bd795cb16f1ac33147e1be2a64b..a733ea9abd2440a6c38aa14c0f974e3fcc7b151d 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler', 'hooks') as $lib) {
+foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
        // Load special functions
        loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -69,20 +69,13 @@ initFatalMessages();
 initMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isInstalling()) && (!isInstallationPhase())) {
-       // Load "databases" aka static arrays
-       loadIncludeOnce('inc/databases.php');
+if (!isInstalling()) {
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
 
        // Load database layer here
        loadIncludeOnce('inc/db/lib.php');
 
-       // Set missing module
-       if (!isModuleSet()) setModule(getRequestElement('module'));
-       if (!isModuleSet()) setModule('index');
-
-       // Load configuration file(s) here
-       loadIncludeOnce('inc/load_config.php');
-
        // CSS array
        initExtensionCssFiles();
 
@@ -112,21 +105,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // Run the init filter chain
                                runFilterChain('init');
 
-                               // Is the extension sql_patches installed and at least 0.3.6?
-                               if ((isExtensionActive('sql_patches')) && (getExtensionVersion('sql_patches') >= '0.3.6')) {
-                                       // Generate random number
-                                       setConfigEntry('RAND_NUMBER', generateRandomCode(10, mt_rand(10000, 32766), getUserId(), ''));
-                               } else {
-                                       // Generate weak (!!!) code
-                                       setConfigEntry('RAND_NUMBER', mt_rand(1000000, 9999999));
-                               }
-
                                // Check module for permissions
                                $checkModule = checkModulePermissions();
 
-                               // Cound module here
-                               countModuleHit(getModule());
-
                                // Admin module should be accessable by guests to login
                                if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
                                        // This is fine and can be ignored
@@ -158,16 +139,16 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        setConfigEntry('OUTPUT_MODE', 'direct');
 
        // This hack prevents a backtrace in CSS output
-       if (getOutputMode() == '1') {
+       if (getOutputMode() == 1) {
                // Problem with config so set output mode
                setConfigEntry('OUTPUT_MODE', 'render');
        } // END - if
 
        // Set other missing variables
-       if (!isOutputModeSet()) setOutputMode('0');
+       if (!isOutputModeSet()) setOutputMode(0);
 
        // Include more
-       foreach (array('inc/databases.php','inc/db/lib.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+       foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
                // Load the include
                loadIncludeOnce($inc);
        } // END - foreach
@@ -176,7 +157,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        loadIncludeOnce('inc/load_config.php');
 
        // Are we installation routine?
-       if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
+       if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
                // You have to install first!
                redirectToUrl('install.php');
        } // END - if
@@ -192,7 +173,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 }
 
 // Handle fatal errors
-handleFatalErrors();
+runFilterChain('handle_fatal_errors');
 
 // [EOF]
 ?>