X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=40a86ef8f9ec909cde97e4f04ff6db6abec42b39;hb=255696fe065d35b951f66168c35296b10fdde060;hp=526741c10c035958a837d20b367285b3e69122c3;hpb=cb20090aa0558f1b74f0e9f925f29819e8bb3a45;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 526741c10c..40a86ef8f9 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -72,6 +72,9 @@ initFatalMessages();
 // Init message system
 initMessages();
 
+// Enable HTML templates by default
+enableTemplateHtml();
+
 // Are we in installation phase?
 if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
@@ -83,7 +86,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// CSS array
 	initExtensionCssFiles();
 
-	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
+	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['dbase']))) {
 		// Connect to DB
 		SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
 
@@ -118,26 +121,22 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 				}
 			} else {
 				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
+				addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
 			}
 		} else {
 			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
+			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
 		}
 	} else {
 		// Maybe you forgot to enter your MySQL data?
-		addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
+		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
 	}
 } else {
-	///////////////////////////////////////////////////
-	// 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) {
+	if (isCssOutputMode()) {
 		// Problem with config so set output mode
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
@@ -146,25 +145,16 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	setConfigEntry('_DB_TYPE', 'mysql3');
 
 	// Include more
-	foreach (array('inc/db/lib.php','inc/databases.php','inc/session.php','inc/versions.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+	foreach (array('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
 		// Load the include
-		loadIncludeOnce($inc);
+		loadIncludeOnce('inc/' . $inc . '.php');
 	} // END - foreach
 
-	// Init filter system here
-	initFilterSystem();
-
-	// Are we installation routine?
-	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-		// You have to install first!
+	// Check wether we are in installation routine
+	if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+		// Redirect to the URL
 		redirectToUrl('install.php');
 	} // END - if
-
-	// Load cache
-	loadIncludeOnce('inc/load_cache.php');
-
-	// Run the init filter chain
-	runFilterChain('init');
 }
 
 // Handle fatal errors