X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmysql-connect.php;h=dd7998d02438c1b4a83eb1b6907a347785551299;hb=a63900f7b420a4aae6d9337116f5729f1485a271;hp=11ed8a13e4e5e58c2af4f47abd1ceae91a0ec957;hpb=f2736bc6457140146890877d992be862a78b259f;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 11ed8a13e4..dd7998d024 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/16/2003 *
- * ===============                              Last change: 12/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/16/2003 *
+ * ===================                          Last change: 12/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : mysql-connect.php                                *
@@ -14,10 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * 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 +41,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
@@ -59,8 +58,11 @@ initErrorHandler();
 // Init request
 initRequest();
 
+// Init userid
+initMemberId();
+
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = 0;
+if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
 
 // Init fatal messages
 initFatalMessages();
@@ -68,8 +70,14 @@ initFatalMessages();
 // Init message system
 initMessages();
 
-// Check if this file is writeable or read-only and warn the user
-if (!isInstalling()) {
+// Init repository data sub-system
+initRepositoryData();
+
+// Enable HTML templates by default
+enableTemplateHtml();
+
+// Are we in installation phase?
+if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -79,7 +87,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__);
 
@@ -99,12 +107,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();
 
@@ -120,53 +122,40 @@ 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 {
-	///////////////////////////////////////////////////
-	// 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
 
+	// CFG: DATABASE-TYPE
+	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('db/lib','databases','session','versions','install-functions','load_config','load_cache') as $inc) {
 		// Load the include
-		loadIncludeOnce($inc);
+		loadIncludeOnce('inc/' . $inc . '.php');
 	} // END - foreach
 
-	// Load config
-	loadIncludeOnce('inc/load_config.php');
-
-	// 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
-
-	// Init filter system here
-	initFilterSystem();
-
-	// Load cache
-	loadIncludeOnce('inc/load_cache.php');
-
-	// Run the init filter chain
-	runFilterChain('init');
 }
 
 // Handle fatal errors