Even more fixes, loading session was on wrong page (needs db link up)

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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e354d7c9c675c4f32590e7811b4c23da9d5a5649..0b60390d9227f7b19fce04dbb1ac7f3a1d4184b2 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -44,7 +44,7 @@ define('DEBUG_SQL', false);
 require("inc/functions.php");
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks', 'session') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
        // Load special functions
        LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
 } // END - foreach
@@ -71,12 +71,8 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_I
        OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
 
-// Set dummy $_CONFIG array
-$_CONFIG = array(
-       'code_length' => 0,
-       'patch_level' => 0,
-       'last_update' => time()
-);
+// Set dummy config array
+initConfig();
 
 // Set important header_sent
 $GLOBALS['header_sent'] = 0;
@@ -87,6 +83,7 @@ initFatalMessages();
 // Check if this file is writeable or read-only and warn the user
 if ((!isInstalling()) && (isInstalled())) {
        // 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";
 
        // CSS array
@@ -107,7 +104,10 @@ if ((!isInstalling()) && (isInstalled())) {
                                unset($MySQL);
 
                                // Load configuration stuff
-                               mergeConfig(LOAD_CONFIG());
+                               loadConfiguration();
+
+                               // Init session
+                               LOAD_INC_ONCE("inc/session.php");
 
                                // Load "databases" aka static arrays
                                LOAD_INC_ONCE("inc/databases.php");
@@ -138,7 +138,7 @@ if ((!isInstalling()) && (isInstalled())) {
                                }
 
                                // Run the init filter chain
-                               RUN_FILTER('init');
+                               runFilterChain('init');
 
                                // Set default 'what' value
                                //* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
@@ -161,8 +161,8 @@ if ((!isInstalling()) && (isInstalled())) {
 
                                // Load all active extension including language files when not upgrading.
                                // Check module for testing and count one click
-                               $dummy = CHECK_MODULE($GLOBALS['module']);
-                               if ($dummy == "done") COUNT_MODULE($GLOBALS['module']);
+                               $dummy = checkModulePermissions($GLOBALS['module']);
+                               if ($dummy == "done") countModuleHit($GLOBALS['module']);
                                unset($dummy);
 
                                // Shall we activate the exchange?
@@ -172,34 +172,25 @@ if ((!isInstalling()) && (isInstalled())) {
                                if (GET_EXT_VERSION("sql_patches") >= "0.3.6") {
                                        // Generate random number
                                        if (isset($GLOBALS['userid'])) {
-                                               define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
+                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), $GLOBALS['userid'], ""));
                                        } else {
-                                               define('RAND_NUMBER', GEN_RANDOM_CODE(10, mt_rand(10000,32766), 0, ""));
+                                               define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), 0, ""));
                                        }
                                } else {
                                        // Generate weak (!!!) code
                                        define('RAND_NUMBER', mt_rand(1000000, 9999999));
                                }
                        } else {
-                               // Add language system
-                               LOAD_INC_ONCE("inc/language.php");
-
                                // Wrong database?
-                               addFatalMessage(getMessage('WRONG_DB_SELECTED'));
+                               addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
                        }
                } else {
-                       // Add language system
-                       LOAD_INC_ONCE("inc/language.php");
-
                        // No link to database!
-                       addFatalMessage(getMessage('NO_DB_LINK'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
                }
        } else {
-               // Add language system
-               LOAD_INC_ONCE("inc/language.php");
-
                // Maybe you forgot to enter your MySQL data?
-               addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
+               addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
        }
 } else {
        ///////////////////////////////////////////////////
@@ -209,6 +200,9 @@ if ((!isInstalling()) && (isInstalled())) {
        // Set other missing variables
        if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
+       // Init session
+       LOAD_INC_ONCE("inc/session.php");
+
        // Include databases.php
        LOAD_INC_ONCE("inc/databases.php");
 
@@ -222,15 +216,18 @@ if ((!isInstalling()) && (isInstalled())) {
        if ((!isInstalled()) || (!isAdminRegistered())) {
                // Check for file permissions
                if (!IS_INC_WRITEABLE("config")) {
-                       addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('CONFIG_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE("dummy")) {
-                       addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('DUMMY_IS_WRITE_PROTECTED'));
                } // END - if
                if (!IS_INC_WRITEABLE(".secret/dummy")) {
-                       addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
+                       addFatalMessage(__FILE__, __LINE__, getMessage('SECRET_IS_WRITE_PROTECTED'));
                } // END - if
        } // END - if
+
+       // Run the init filter chain
+       runFilterChain('init');
 }
 
 if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {