X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=42b6a887dc41966c7e792983c6961eedb17841f0;hp=741122f5a8e450b1f1d3d45008fe23de463c72cd;hb=a2ca374f65976d21651fffb64a78d3a9678bb3b8;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 741122f5a8..42b6a887dc 100644
--- 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,15 +69,12 @@ 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 database layer here
 	loadIncludeOnce('inc/db/lib.php');
 
 	// Set missing module
-	if (!isModuleSet()) setModule(getRequestElement('module'));
+	if ((!isModuleSet()) && (isGetRequestElementSet('module'))) setModule(getRequestElement('module'));
 	if (!isModuleSet()) setModule('index');
 
 	// Load configuration file(s) here
@@ -103,7 +100,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 				// Remove MySQL array from namespace
 				unset($GLOBALS['mysql']);
 
-				// Administrative functions
+				// Load cache
 				loadIncludeOnce('inc/load_cache.php');
 
 				// Init filter system
@@ -112,21 +109,12 @@ 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));
-				}
+				// Load "databases" aka static arrays
+				loadIncludeOnce('inc/databases.php');
 
 				// 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,41 +146,41 @@ 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
 
-	// Init filter system here
-	initFilterSystem();
+	// Load config
+	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
 
-	// Administrative functions
+	// Init filter system here
+	initFilterSystem();
+
+	// Load cache
 	loadIncludeOnce('inc/load_cache.php');
 
 	// Run the init filter chain
 	runFilterChain('init');
-
-	// Load configuration file(s) here
-	loadIncludeOnce('inc/load_config.php');
 }
 
 // Handle fatal errors
-handleFatalErrors();
+runFilterChain('handle_fatal_errors');
 
 // [EOF]
 ?>