X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=84c9a6a1e31a354de1c029e4f4894eadb497d186;hp=f9f1457e4d078eefb271a0140d232a654c654a18;hb=a7b0c182c660809dc95c8dd1205809006ae2f9c7;hpb=9fd580a0c95cbb6a3e50f0c110805ff1636e4acf

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index f9f1457e4d..84c9a6a1e3 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -40,82 +40,35 @@ if (!defined('__SECURITY')) {
 // CFG: DEBUG-SQL (if enabled and DEBUG_MODE is enabled all SQL queries will be logged to debug.log)
 define('DEBUG_SQL', false);
 
-// Load database library
-require_once(PATH."inc/db/lib.php");
-
 // Non-database functions
-require_once(PATH."inc/functions.php");
-
-// Filter functions
-require_once(PATH."inc/filters.php");  
-
-// Functions which interact with the database
-require_once(PATH."inc/mysql-manager.php");
-
-// Load extensions and language
-require_once(PATH."inc/extensions.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! :-)
-		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
-		print("Please report this error at <a href=\"http://bugs.mxchange.org\" rel=\"external\" target=\"_blank\">bugs.mxchange.org</a>:<pre>");
-		debug_print_backtrace();
-		die("</pre>Thank you for your help finding bugs.");
-	}
-}
+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) {
+	// 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 () {
-	global $link;
-
-	// Call the filter chain 'shutdown'
-	RUN_FILTER('shutdown', null, false);
-
-	if (is_resource($link)) {
-		// Close link
-		SQL_CLOSE($link, __FILE__, __LINE__);
-	} else {
-		// No database link
-		ADD_FATAL(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
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ";
+	OUTPUT_HTML("<strong>{--LANG_WARNING--}:</strong> ");
 	if (isBooleanConstantAndTrue('mxchange_installed')) {
 		// You have changed my configuration file!
-		die(DIE_CONFIG_CHANGED_YOU);
+		mxchange_die("{--DIE_CONFIG_CHANGED_YOU--}");
 	} else {
 		// Please run the installation script (maybe again)
-		die(DIE_RUN_INSTALL_MYSQL);
+		mxchange_die("{--DIE_RUN_INSTALL_MYSQL--}");
 	}
-} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!isset($_GET['installing'])) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
+} elseif ((!isBooleanConstantAndTrue('mxchange_installing')) && (!REQUEST_ISSET_GET(('installing'))) && (empty($MySQL['password'])) && (isBooleanConstantAndTrue('warn_no_pass'))) {
 	// No database password entered!!!
-	echo "<STRONG>".LANG_WARNING.":</STRONG> ".WARN_NULL_PASSWORD;
+	OUTPUT_HTML("<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}");
 }
 
 // Set dummy $_CONFIG array
@@ -125,27 +78,28 @@ $_CONFIG = array(
 	'last_update' => time()
 );
 
+// Set important header_sent
+$GLOBALS['header_sent'] = 0;
+
+// Init fatal messages
+initFatalMessages();
+
 // Check if this file is writeable or read-only and warn the user
 if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndTrue('mxchange_installed'))) {
 	// Check for write-permission for config.php and inc directory
 	if (empty($GLOBALS['module'])) $GLOBALS['module'] = "index";
 
 	// CSS array
-	$EXT_CSS_FILES = array();
+	EXT_INIT_CSS_FILES();
 
 	if ((!empty($MySQL['host'])) && (!empty($MySQL['login'])) && (!empty($MySQL['password'])) && (!empty($MySQL['dbase']))) {
 		// Connect to DB
-		global $link;
-		$link = SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
+		SQL_CONNECT($MySQL['host'], $MySQL['login'], $MySQL['password'], __FILE__, __LINE__);
 
 		// Is the link valid?
-		if (is_resource($link)) {
-			// Choose the database
-			global $db;
-			$db = SQL_SELECT_DB($MySQL['dbase'], $link, __FILE__, __LINE__);
-
+		if (SQL_IS_LINK_UP()) {
 			// Is it a valid resource?
-			if ($db === true) {
+			if (SQL_SELECT_DB($MySQL['dbase'], __FILE__, __LINE__) === true) {
 				// This is required for extension 'optimize' to work
 				define('__DB_NAME', $MySQL['dbase']);
 
@@ -153,30 +107,27 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				unset($MySQL);
 
 				// Load configuration stuff
-				$_CONFIG = merge_array($_CONFIG, LOAD_CONFIG());
+				mergeConfig(LOAD_CONFIG());
 
 				// Load "databases" aka static arrays
-				require_once(PATH."inc/databases.php");
+				LOAD_INC_ONCE("inc/databases.php");
 
 				// Loading patching system is required here...
-				require_once(PATH."inc/patch-system.php"); // Initialize patch system
-
-				// Session management
-				require_once(PATH."inc/session.php");
+				LOAD_INC_ONCE("inc/patch-system.php"); // Initialize patch system
 
 				// Run daily reset
-				require_once(PATH."inc/check-reset.php");
+				LOAD_INC_ONCE("inc/check-reset.php");
 
 				// Load admin include file if he is admin
 				if (IS_ADMIN()) {
 					// Administrative functions
-					require_once(PATH."inc/modules/admin/admin-inc.php");
+					LOAD_INC_ONCE("inc/modules/admin/admin-inc.php");
 				} // END - if
 				//* DEBUG: */ ADD_POINTS_REFSYSTEM("test", 36, 1000);
 				//* DEBUG: */ die();
 
 				// Get all values
-				if (($CSS != 1) && ($CSS != -1)) {
+				if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
 					if (empty($GLOBALS['module']))  $GLOBALS['module'] = "empty";
 					if (empty($GLOBALS['what']))    $GLOBALS['what']   = GET_WHAT($GLOBALS['module']);
 					if (empty($GLOBALS['action']))  $GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -190,8 +141,8 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				RUN_FILTER('init');
 
 				// Set default 'what' value
-				//* DEBUG: */ echo "-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />\n";
-				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($CSS != 1) && ($CSS != -1)) {
+				//* DEBUG: */ OUTPUT_HTML("-".$GLOBALS['module']."/".$GLOBALS['what']."-<br />");
+				if ((empty($GLOBALS['what'])) && (empty($GLOBALS['action'])) && ($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
 					if ($GLOBALS['module'] == "admin") {
 						// Set 'action' value to 'login' in admin menu
 						$GLOBALS['action'] = GET_ACTION($GLOBALS['module'], $GLOBALS['what']);
@@ -206,7 +157,7 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				} // END - if
 
 				// Update sending pool
-				if (($CSS != "1") && ($CSS != "-1")) require_once(PATH."inc/pool-update.php"); // Sends out mails in configureable steps
+				if (($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != "-1")) LOAD_INC_ONCE("inc/pool-update.php"); // Sends out mails in configureable steps
 
 				// Load all active extension including language files when not upgrading.
 				// Check module for testing and count one click
@@ -231,25 +182,24 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 				}
 			} else {
 				// Add language system
-				include (PATH."inc/language.php");
+				LOAD_INC_ONCE("inc/language.php");
 
 				// Wrong database?
-				ADD_FATAL(WRONG_DB_SELECTED);
+				addFatalMessage(getMessage('WRONG_DB_SELECTED'));
 			}
 		} else {
 			// Add language system
-			include (PATH."inc/language.php");
+			LOAD_INC_ONCE("inc/language.php");
 
 			// No link to database!
-			ADD_FATAL(NO_DB_LINK);
-			$db = false;
+			addFatalMessage(getMessage('NO_DB_LINK'));
 		}
 	} else {
 		// Add language system
-		include (PATH."inc/language.php");
+		LOAD_INC_ONCE("inc/language.php");
 
 		// Maybe you forgot to enter your MySQL data?
-		ADD_FATAL(MYSQL_DATA_MISSING);
+		addFatalMessage(getMessage('MYSQL_DATA_MISSING'));
 	}
 } else {
 	///////////////////////////////////////////////////
@@ -257,15 +207,13 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 	///////////////////////////////////////////////////
 
 	// Set other missing variables
-	if (!isset($CSS)) $CSS = "0";
-	$link = false; // No database link by default
+	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = "0";
 
-	// Include required files
-	require_once(PATH."inc/databases.php");
-	require_once(PATH."inc/session.php");
+	// Include databases.php
+	LOAD_INC_ONCE("inc/databases.php");
 
 	// Check if we are in installation routine
-	if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($CSS != "1") && ($CSS != -1)) {
+	if ((basename($_SERVER['PHP_SELF']) != "install.php") && ($GLOBALS['output_mode'] != "1") && ($GLOBALS['output_mode'] != -1)) {
 		// Redirect to the installation system
 		LOAD_URL("install.php");
 	} // END - if
@@ -274,26 +222,22 @@ if ((!isBooleanConstantAndTrue('mxchange_installing')) && (isBooleanConstantAndT
 	if ((!isBooleanConstantAndTrue('mxchange_installed')) || (!isBooleanConstantAndTrue('admin_registered'))) {
 		// Check for file permissions
 		if (!IS_INC_WRITEABLE("config")) {
-			ADD_FATAL(CONFIG_IS_WRITE_PROTECTED);
+			addFatalMessage(getMessage('CONFIG_IS_WRITE_PROTECTED'));
 		} // END - if
 		if (!IS_INC_WRITEABLE("dummy")) {
-			ADD_FATAL(DUMMY_IS_WRITE_PROTECTED);
+			addFatalMessage(getMessage('DUMMY_IS_WRITE_PROTECTED'));
 		} // END - if
 		if (!IS_INC_WRITEABLE(".secret/dummy")) {
-			ADD_FATAL(SECRET_IS_WRITE_PROTECTED);
+			addFatalMessage(getMessage('SECRET_IS_WRITE_PROTECTED'));
 		} // END - if
 	} // END - if
 }
 
-// Any fatal messages?
-if (!is_array($FATAL)) $FATAL = array();
-if (((sizeof($FATAL) > 0) || (!empty($FATAL[0]))) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($CSS != "1")) {
+if ((getTotalFatalErrors() > 0) && (isBooleanConstantAndTrue('mxchange_installed')) && (!defined('mxchange_installing')) && ($GLOBALS['output_mode'] != "1")) {
 	// One or more fatal error(s) occur during connect...
-	include (PATH."inc/header.php");
-	include (PATH."inc/fatal_errors.php");
-	unset($FATAL);
-	include (PATH."inc/footer.php");
-	exit;
+	LOAD_INC_ONCE("inc/header.php");
+	LOAD_INC_ONCE("inc/fatal_errors.php");
+	LOAD_INC_ONCE("inc/footer.php");
 } // END - if
 
 //