X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=e18c8cec126d799f2a042497a424bc603f193e16;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=a4e1a8b739d27abd654419b29cc30cdb932b509f;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index a4e1a8b739..e18c8cec12 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -71,8 +72,11 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Enable HTML templates by default
+enableTemplateHtml();
+
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -82,7 +86,7 @@ if (!isInstalling()) {
 	// 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__);
 
@@ -102,12 +106,6 @@ if (!isInstalling()) {
 				// Load cache
 				loadIncludeOnce('inc/load_cache.php');
 
-				// Init filter system
-				initFilterSystem();
-
-				// Run the init filter chain
-				runFilterChain('init');
-
 				// Check module for permissions
 				$checkModule = checkModulePermissions();
 
@@ -123,15 +121,15 @@ if (!isInstalling()) {
 				}
 			} 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 {
 	///////////////////////////////////////////////////
@@ -142,7 +140,7 @@ if (!isInstalling()) {
 	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,28 +149,22 @@ if (!isInstalling()) {
 	setConfigEntry('_DB_TYPE', 'mysql3');
 
 	// Include more
-	foreach (array('inc/databases.php','inc/versions.php','inc/db/lib.php','inc/session.php','inc/install-functions.php','inc/load_config.php') as $inc) {
+	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) {
 		// Load the include
 		loadIncludeOnce($inc);
 	} // END - foreach
 
-	// Load config
-	loadIncludeOnce('inc/load_config.php');
-
-	// Are we installation routine?
-	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-		// You have to install first!
-		redirectToUrl('install.php');
-	} // END - if
-
-	// Init filter system here
-	initFilterSystem();
-
 	// 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