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 e0914d2dd293524b5298152799fe49863cecdae6..a733ea9abd2440a6c38aa14c0f974e3fcc7b151d 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -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()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
-       if (!isModuleSet()) setModule('index');
-
-       // Load configuration file(s) here
-       loadIncludeOnce('inc/load_config.php');
-
        // CSS array
        initExtensionCssFiles();
 
@@ -115,9 +108,6 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
                                // 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,7 +148,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
        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
@@ -183,7 +173,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 }
 
 // Handle fatal errors
-handleFatalErrors();
+runFilterChain('handle_fatal_errors');
 
 // [EOF]
 ?>