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

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 526741c10c..e18c8cec12 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,15 +121,15 @@ 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 {
 	///////////////////////////////////////////////////
@@ -137,7 +140,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	setConfigEntry('OUTPUT_MODE', 'direct');
 
 	// This hack prevents a backtrace in CSS output
-	if (getOutputMode() == 1) {
+	if (getScriptOutputMode() == 1) {
 		// Problem with config so set output mode
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
@@ -151,20 +154,17 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 		loadIncludeOnce($inc);
 	} // END - foreach
 
-	// Init filter system here
-	initFilterSystem();
-
-	// Are we installation routine?
-	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-		// You have to install first!
-		redirectToUrl('install.php');
-	} // END - if
-
 	// Load cache
 	loadIncludeOnce('inc/load_cache.php');
 
 	// Run the init filter chain
 	runFilterChain('init');
+
+	// Are we installation routine?
+	if ((!isInstalling()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
+		// You have to install first!
+		redirectToUrl('install.php');
+	} // END - if
 }
 
 // Handle fatal errors