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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 741122f5a8..eaa939dc58 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
@@ -103,7 +103,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,15 +112,6 @@ 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();
 
@@ -172,8 +163,8 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 		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)) {
@@ -181,14 +172,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 		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