X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=fd68e77b913ebfef04439eaa1b479facf35b4e1b;hb=5ab0d021f3e96722af5d96d2b9036430200c06cb;hp=12dd105bb298da0153e46a7f2a4cdda4a99bfdf0;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 12dd105bb2..fd68e77b91 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -40,17 +40,44 @@ 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',
+		'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 +89,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
@@ -89,37 +116,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) {
-				// Set database name (required for ext-optimize and isSqlTableCreated())
-				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
-
-				// Remove MySQL array from namespace
-				unset($GLOBALS['mysql']);
-
-				// Load cache
-				loadIncludeOnce('inc/load_cache.php');
-			} else {
-				// Wrong database?
-				debug_report_bug(__FILE__, __LINE__, 'Wrong database selected.');
-			}
-		} else {
-			// No link to database!
-			debug_report_bug(__FILE__, __LINE__, 'Database link is not yet up.');
-		}
-	} else {
-		// Maybe you forgot to enter your database login?
-		debug_report_bug(__FILE__, __LINE__, 'Database login is missing.');
-	}
+	// Initialize SQL link
+	initSqlLink();
 } else {
 	// Default output is 'direct' for HTML output
 	setConfigEntry('OUTPUT_MODE', 'direct');
@@ -133,6 +131,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');
 
@@ -145,7 +146,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');