X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=9e26bddaad8750409e35be027a61977e2533c613;hp=8693a51c6b33fac51b5028e2b12f7dc643401cc0;hb=525510c6f6ee4798619dba6236c6b6d85263ac22;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 8693a51c6b..9e26bddaad 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -49,7 +49,7 @@ require('inc/functions.php');
 require('inc/wrapper-functions.php');
 
 // Load more function libraries or includes
-foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
+foreach (array('request-functions', 'session-functions', 'config-functions', 'code-functions', 'inc-functions', 'language-functions', 'filters', 'mysql-manager', 'extensions', 'db/lib', 'handler', 'hooks') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -57,36 +57,32 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
-// Load configuration file(s) here
-loadIncludeOnce('inc/load_config.php');
+// Disable block-mode by default
+enableBlockMode(false);
+
+// Init error handler
+initErrorHandler();
+
+// Init request
+initRequest();
 
 // Set important header_sent
-$GLOBALS['header_sent'] = 0;
-
-// Check if the user setups his MySQL stuff...
-if ((empty($GLOBALS['mysql']['login'])) && (!isInstalling()) && (!REQUEST_ISSET_GET('installing')) && (isInstalled())) {
-	// No login entered and outside installation mode
-	OUTPUT_HTML('<strong>{--LANG_WARNING--}:</strong> ');
-	if (isInstalled()) {
-		// You have changed my configuration file!
-		app_die(__FILE__, __LINE__, '{--DIE_CONFIG_CHANGED_YOU--}');
-	} else {
-		// Please run the installation script (maybe again)
-		app_die(__FILE__, __LINE__, '{--DIE_RUN_INSTALL_MYSQL--}');
-	}
-} elseif ((!isInstalling()) && (empty($GLOBALS['mysql']['password'])) && (getConfig('WARN_NO_PASS') == 'Y')) {
-	// No database password entered!!!
-	OUTPUT_HTML('<div>{--LANG_WARNING--}:</div> {--WARN_NULL_PASSWORD--}');
-}
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
 
 // Init fatal messages
 initFatalMessages();
 
 // Check if this file is writeable or read-only and warn the user
 if ((!isInstalling()) && (isInstalled())) {
+	// Load "databases" aka static arrays
+	loadIncludeOnce('inc/databases.php');
+
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
+
 	// 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';
+	if (!isModuleSet()) setModule(REQUEST_GET('module'));
+	if (!isModuleSet()) setModule('index');
 
 	// CSS array
 	EXT_INIT_CSS_FILES();
@@ -97,6 +93,9 @@ if ((!isInstalling()) && (isInstalled())) {
 
 		// Is the link valid?
 		if (SQL_IS_LINK_UP()) {
+			// Enable exit on error
+			enableExitOnError();
+
 			// Is it a valid resource?
 			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
 				// This is required for extension 'optimize' to work
@@ -108,9 +107,6 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Load configuration stuff
 				loadConfiguration();
 
-				// Load "databases" aka static arrays
-				loadIncludeOnce('inc/databases.php');
-
 				// Init session
 				loadIncludeOnce('inc/session.php');
 
@@ -132,41 +128,41 @@ if ((!isInstalling()) && (isInstalled())) {
 				//* DEBUG: */ die();
 
 				// Get all values
-				if (($GLOBALS['output_mode'] != 1) && ($GLOBALS['output_mode'] != -1)) {
-					if (empty($GLOBALS['module']))  $GLOBALS['module'] = 'empty';
-					if (empty($GLOBALS['what']))    $GLOBALS['what']   = getWhatFromModule($GLOBALS['module']);
-					if (empty($GLOBALS['action']))  $GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
+				if ((getOutputMode() != 1) && (getOutputMode() != -1)) {
+					if (!isModuleSet())  setModule('empty');
+					if (!isWhatSet())    setWhat(getWhatFromModule(getModule()));
+					if (!isActionSet())  setAction(getModeAction(getModule(), getWhat()));
 				} else {
 					// Set action/what to empty
-					$GLOBALS['action'] = '';
-					$GLOBALS['what']   = '';
+					setAction('');
+					setWhat('');
 				}
 
 				// Run the init filter chain
 				runFilterChain('init');
 
 				// Set default 'what' value
-				//* 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') {
+				//* DEBUG: */ OUTPUT_HTML('-'.getModule().'/'.getWhat()."-<br />");
+				if ((!isWhatSet()) && (!isActionSet()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
+					if (getModule() == 'admin') {
 						// Set 'action' value to 'login' in admin menu
-						$GLOBALS['action'] = getModeAction($GLOBALS['module'], $GLOBALS['what']);
-					} elseif (($GLOBALS['module'] == 'index') || ($GLOBALS['module'] == 'login')) {
+						setAction(getModeAction(getModule(), getWhat()));
+					} elseif ((getModule() == 'index') || (getModule() == 'login')) {
 						// Set 'what' value to 'welcome' in guest and member menu
-						$GLOBALS['what'] = 'welcome';
-						if (getConfig('index_home') != '') $GLOBALS['what'] = getConfig('index_home');
+						setWhat('welcome');
+						if (getConfig('index_home') != '') setWhatFromConfig('index_home');
 					} else {
 						// Anything else like begging link
-						$GLOBALS['what'] = '';
+						setWhat('');
 					}
 				} // END - if
 
 				// Update sending pool
-				if (($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != '-1')) loadIncludeOnce('inc/pool-update.php'); // Sends out mails in configureable steps
+				if ((getOutputMode() != '1') && (getOutputMode() != '-1')) loadIncludeOnce('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
-				if (checkModulePermissions($GLOBALS['module']) == 'done') countModuleHit($GLOBALS['module']);
+				if (checkModulePermissions(getModule()) == 'done') countModuleHit(getModule());
 
 				// Shall we activate the exchange?
 				if (getConfig('activate_xchange') > 0) activateExchange();
@@ -174,7 +170,7 @@ if ((!isInstalling()) && (isInstalled())) {
 				// Is the extension sql_patches installed and at least 0.3.6?
 				if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
 					// Generate random number
-					define('RAND_NUMBER', generateRandomCodde(10, mt_rand(10000,32766), getUserId(), ''));
+					define('RAND_NUMBER', generateRandomCode(10, mt_rand(10000,32766), getUserId(), ''));
 				} else {
 					// Generate weak (!!!) code
 					define('RAND_NUMBER', mt_rand(1000000, 9999999));
@@ -196,8 +192,17 @@ if ((!isInstalling()) && (isInstalled())) {
 	// Include neccessary functions for installation //
 	///////////////////////////////////////////////////
 
+	// Default output is 'direct' for HTML output
+	setConfigEntry('OUTPUT_MODE', 'direct');
+
+	// This hack prevents a backtrace in CSS output
+	if (getOutputMode() == '1') {
+		// Problem with config so set output mode
+		setConfigEntry('OUTPUT_MODE', 'render');
+	} // END - if
+
 	// Set other missing variables
-	if (!isset($GLOBALS['output_mode'])) $GLOBALS['output_mode'] = '0';
+	if (!isOutputModeSet()) setOutputMode('0');
 
 	// Include databases.php
 	loadIncludeOnce('inc/databases.php');
@@ -209,7 +214,7 @@ if ((!isInstalling()) && (isInstalled())) {
 	loadIncludeOnce('inc/versions.php');
 
 	// Check if we are in installation routine
-	if ((!isInstalling()) && ($GLOBALS['output_mode'] != '1') && ($GLOBALS['output_mode'] != -1)) {
+	if ((!isInstalling()) && (getOutputMode() != '1') && (getOutputMode() != -1)) {
 		// Redirect to the installation system
 		redirectToUrl('install.php');
 	} // END - if
@@ -233,9 +238,18 @@ if ((!isInstalling()) && (isInstalled())) {
 
 	// Load extension 'sql_patches'
 	LOAD_EXTENSION('sql_patches');
+
+	// Load configuration file(s) here
+	loadIncludeOnce('inc/load_config.php');
 }
 
-if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && ($GLOBALS['output_mode'] != '1')) {
+// Init session
+loadIncludeOnce('inc/session.php');
+
+// Load versions
+loadIncludeOnce('inc/versions.php');
+
+if ((getTotalFatalErrors() > 0) && (isInstalled()) && (!isInstalling()) && (getOutputMode() != '1')) {
 	// One or more fatal error(s) occur during connect...
 	loadIncludeOnce('inc/header.php');
 	loadIncludeOnce('inc/fatal_errors.php');