X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=5cd6a3cf45277990ba93d498c8da49ef1fe61e85;hp=d10f8b3dc00c64cfe6f66492b2b3a6f2179c900a;hb=8cab12aa2bd0bd1de03a377b37cd42faae64b0e1;hpb=b63d821867a14d9c7f7557ed0348f55b90669ef6

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index d10f8b3dc0..5cd6a3cf45 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 - 2013 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,17 +40,45 @@ if (!defined('__SECURITY')) {
 	die();
 } // END - if
 
+// Init array
+$__functions = array();
+
+// Init include file array as it follows same naming scheme
+foreach ( array(
+		'stats',
+		'xml',
+		'callback',
+		'referral',
+		'email',
+		'request',
+		'session',
+		'code',
+		'pool',
+		'language',
+		'sql',
+		'expression',
+		'filter',
+		'revision',
+		'extensions') as $lib) {
+
+	// Add it
+	array_push($__functions, $lib . '-functions');
+} // 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_merge($__functions, array('filters', 'mysql-manager', 'handler')) as $lib) {
 	// Load special functions
 	loadIncludeOnce('inc/' . $lib . '.php');
 } // END - foreach
 
+// Remove array
+unset($__functions);
+
 // Set error handler
 set_error_handler('__errorHandler');
 
 // Disable block-mode by default
-enableBlockMode(false);
+enableBlockMode(FALSE);
 
 // Init error handler
 initErrorHandler();
@@ -62,8 +90,8 @@ 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
@@ -76,7 +104,7 @@ initRepositoryData();
 enableTemplateHtml();
 
 // Are we in installation phase?
-if ((!isInstalling()) && (!isInstallationPhase())) {
+if ((!isInstaller()) && (isInstalled())) {
 	// Load configuration file(s) here
 	loadIncludeOnce('inc/load_config.php');
 
@@ -89,37 +117,8 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// CSS array
 	initExtensionCssFiles();
 
-	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__);
-
-		// 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');
-			} else {
-				// Wrong database?
-				addFatalMessage(__FILE__, __LINE__, '{--WRONG_DB_SELECTED--}');
-			}
-		} else {
-			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
-		}
-	} else {
-		// Maybe you forgot to enter your database login?
-		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
-	}
+	// Initialize SQL link
+	initSqlLink();
 } else {
 	// Default output is 'direct' for HTML output
 	setConfigEntry('OUTPUT_MODE', 'direct');
@@ -133,6 +132,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// CFG: DATABASE-TYPE
 	setConfigEntry('_DB_TYPE', 'mysql3');
 
+	// Set link as down
+	unsetSqlLinkUp(__FILE__, __LINE__);
+
 	// Load database layer here
 	loadIncludeOnce('inc/db/lib.php');
 
@@ -141,11 +143,14 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
 	// Include more
 	foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
-		// Load the include
+		// Load include file
 		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');