X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=77eb4bb074d33739ebbd9d06ebbffb458c45abcc;hb=89aad2c011d4734037ecf8128ed98d24d9fcd09e;hp=0dd8936b1e9bd8815c401b7d267fa7d9fd435c8b;hpb=c00854616d540e2372c89cc04ab3677544efbd35;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 0dd8936b1e..77eb4bb074 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -41,8 +40,28 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Init include file array as it follows same naming scheme
+foreach ( array(
+		'stats',
+		'xml',
+		'callback',
+		'referral',
+		'email',
+		'request',
+		'session',
+		'code',
+		'language',
+		'sql',
+		'expression',
+		'filter',
+		'revision',
+		'extensions') as $lib) {
+	// Load special functions
+	loadIncludeOnce('inc/' . $lib . '-functions.php');
+} // END - foreach
+
 // Load more function libraries or includes
-foreach (array('functions', 'request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions', 'filters', 'mysql-manager', 'extensions-functions', 'handler') as $lib) {
+foreach (array('filters', 'mysql-manager', 'handler') as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
@@ -51,7 +70,7 @@ foreach (array('functions', 'request-functions', 'session-functions', 'code-func
 set_error_handler('__errorHandler');
 
 // Disable block-mode by default
-enableBlockMode(false);
+enableBlockMode(FALSE);
 
 // Init error handler
 initErrorHandler();
@@ -63,13 +82,18 @@ initRequest();
 initMemberId();
 
 // Set important header_sent
-if (!isset($GLOBALS['header_sent'])) $GLOBALS['header_sent'] = '0';
+if (!isset($GLOBALS['__header_sent'])) {
+	$GLOBALS['__header_sent'] = '0';
+} // END - if
 
 // Init fatal messages
 initFatalMessages();
 
-// Init message system
-initMessages();
+// Init repository data sub-system
+initRepositoryData();
+
+// Enable HTML templates by default
+enableTemplateHtml();
 
 // Are we in installation phase?
 if ((!isInstalling()) && (!isInstallationPhase())) {
@@ -79,64 +103,20 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load database layer here
 	loadIncludeOnce('inc/db/lib.php');
 
+	// Init message system
+	initMessages();
+
 	// CSS array
 	initExtensionCssFiles();
 
-	if ((!empty($GLOBALS['mysql']['host'])) && (!empty($GLOBALS['mysql']['login'])) && (!empty($GLOBALS['mysql']['password'])) && (!empty($GLOBALS['mysql']['dbase']))) {
-		// Connect to DB
-		SQL_CONNECT($GLOBALS['mysql']['host'], $GLOBALS['mysql']['login'], $GLOBALS['mysql']['password'], __FILE__, __LINE__);
-
-		// 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
-				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
-
-				// Remove MySQL array from namespace
-				unset($GLOBALS['mysql']);
-
-				// Load cache
-				loadIncludeOnce('inc/load_cache.php');
-
-				// Check module for permissions
-				$checkModule = checkModulePermissions();
-
-				// Admin module should be accessable by guests to login
-				if ((getModule() == 'admin') && ($checkModule == 'admin_only')) {
-					// This is fine and can be ignored
-				} elseif ($checkModule != 'done') {
-					// Not fine!
-					logDebugMessage(__FILE__, __LINE__, sprintf("Check of module %s results in unexpected value: %s",
-						getModule(),
-						$checkModule
-					));
-				}
-			} else {
-				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, getMessage('WRONG_DB_SELECTED'));
-			}
-		} else {
-			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, getMessage('NO_DB_LINK'));
-		}
-	} else {
-		// Maybe you forgot to enter your MySQL data?
-		addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_DATA_MISSING'));
-	}
+	// Initialize SQL link
+	initSqlLink();
 } 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
@@ -144,29 +124,26 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// CFG: DATABASE-TYPE
 	setConfigEntry('_DB_TYPE', 'mysql3');
 
+	// Load database layer here
+	loadIncludeOnce('inc/db/lib.php');
+
+	// Init message system
+	initMessages();
+
 	// 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('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');
+	// Init installer
+	initInstaller();
 
-	// Init filter system here
-	initFilterSystem();
-
-	// Are we installation routine?
-	if ((!isInstalling()) && (getOutputMode() != 1) && (getOutputMode() != -1)) {
-		// You have to install first!
+	// Check whether 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