X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=14ff7074fe7f46be755e3a2f3f76cdada506f75e;hb=1f507f190ba73b50dc005b6d5597422f239b3761;hp=0d53569e82584100cf0b2705e8f5c45098af3adf;hpb=d016e24dd4686f613a17733b96bc28fac936a4ac;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 0d53569e82..14ff7074fe 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -43,63 +43,20 @@ define('DEBUG_SQL', false);
 // Non-database functions
 require("inc/functions.php");
 
-// Filter functions
-LOAD_INC_ONCE("inc/filters.php");  
-
-// Functions which interact with the database
-LOAD_INC_ONCE("inc/mysql-manager.php");
-
-// Load extensions and language
-LOAD_INC_ONCE("inc/extensions.php");
-
-// Load database library
-LOAD_INC_ONCE("inc/db/lib.php");
-
-// Error handler function
-function __errorHandler ($errno, $errstr, $errfile, $errline) {
-	// Construct message
-	$msg = sprintf("errno=%s,errstr=%s,errfile=%s,errline=%s",
-		$errno,
-		$errstr,
-		basename($errfile),
-		$errline
-	);
-
-	// Write debug log message
-	DEBUG_LOG(__FUNCTION__, __LINE__, "".$msg, true);
-
-	// Output message to user and die
-	if (EXT_IS_ACTIVE("debug")) {
-		// Debug extension found! So Output a small message
-		mxchange_die("Error message written to debug.log. Please try to call <a href=\"{!URL!}\">the main page</a> to continue.");
-	} else {
-		// No debug extension found, so regular output
-		debug_report_bug($msg);
-	}
-}
+// 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) {
+	// Load special functions
+	LOAD_INC_ONCE(sprintf("inc/%s.php", $lib));
+} // END - foreach
 
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Call-back function for running shutdown functions and close database connection
-function __SHUTDOWN_HOOK () {
-	// Call the filter chain 'shutdown'
-	RUN_FILTER('shutdown', null, false);
-
-	if (SQL_IS_LINK_UP()) {
-		// Close link
-		SQL_CLOSE(__FILE__, __LINE__);
-	} else {
-		// No database link
-		addFatalMessage(getMessage('NO_DB_LINK'));
-	}
-}
-
 // Register shutdown hook
 register_shutdown_function('__SHUTDOWN_HOOK');
 
 // Check if the user setups his MySQL stuff...
-if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_GET['installing'])) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (isBooleanConstantAndTrue('mxchange_installed'))) {
 	// No login entered and outside installation mode
 	OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
 	if (isBooleanConstantAndTrue('mxchange_installed')) {
@@ -109,7 +66,7 @@ if ((empty($MySQL['login'])) && (!defined('mxchange_installing')) && (!isset($_G
 		// Please run the installation script (maybe again)
 		mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
 	}
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isInstalling()) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
 	// No database password entered!!!
 	OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
@@ -128,7 +85,7 @@ $GLOBALS['header_sent'] = 0;
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
-if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
+if ((!isInstalling()) && (isBooleanConstantAndTrue('mxchange_installed'))) {
 	// Check for write-permission for config.php and inc directory
 	if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
 
@@ -158,9 +115,6 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				// Loading patching system is required here...
 				LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
-				// Session management
-				LOAD_INC_ONCE("inc/session.php");
-
 				// Run daily reset
 				LOAD_INC_ONCE("inc/check-reset.php");
 
@@ -255,9 +209,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 	// Set other missing variables
 	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
-	// Include required files
+	// Include databases.php
 	LOAD_INC_ONCE("inc/databases.php");
-	LOAD_INC_ONCE("inc/session.php");
 
 	// Check if we are in installation routine
 	if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {