X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=defaaeba0dc67b48953e6435b3e6f72e95bc0d9b;hb=df785ee14455a9b6730943e28030ad2ee6e1ecb7;hp=ceb238175d7d41aeafa9446a3dc738eaa9db7dd5;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index ceb238175d..defaaeba0d 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * 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 *
@@ -40,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('request-functions', 'session-functions', 'code-functions', 'language-functions', 'sql-functions', 'expression-functions', 'filter-functions','revision-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
@@ -62,7 +82,9 @@ 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();
@@ -98,7 +120,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
 			// Is it a valid resource?
 			if (SQL_SELECT_DB($GLOBALS['mysql']['dbase'], __FILE__, __LINE__) === true) {
-				// This is required for extension 'optimize' to work
+				// Set database name (required for ext-optimize and ifSqlTableExists())
 				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
 				// Remove MySQL array from namespace
@@ -108,15 +130,15 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 				loadIncludeOnce('inc/load_cache.php');
 			} else {
 				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
+				reportBug(__FILE__, __LINE__, 'Wrong database selected.');
 			}
 		} else {
 			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
+			reportBug(__FILE__, __LINE__, 'Database link is not yet up.');
 		}
 	} else {
 		// Maybe you forgot to enter your database login?
-		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
+		reportBug(__FILE__, __LINE__, 'Database login is missing.');
 	}
 } else {
 	// Default output is 'direct' for HTML output
@@ -143,7 +165,10 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 		loadIncludeOnce('inc/' . $inc . '.php');
 	} // END - foreach
 
-	// Check wether we are in installation routine
+	// Init installer
+	initInstaller();
+
+	// Check whether we are in installation routine
 	if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
 		// Redirect to the URL
 		redirectToUrl('install.php');