X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=12dd105bb298da0153e46a7f2a4cdda4a99bfdf0;hb=79c52953ae6fbbf4a533967c74d327a7aca13bf7;hp=6124c29e4d9dc2f06605fc8f5385618299d92b10;hpb=b2f01829418c02c494de491ac098c2dd66a94a39;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 6124c29e4d..12dd105bb2 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, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 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,7 +41,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // 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('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
@@ -62,7 +62,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 +100,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 isSqlTableCreated())
 				setConfigEntry('__DB_NAME', $GLOBALS['mysql']['dbase']);
 
 				// Remove MySQL array from namespace
@@ -106,31 +108,17 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 
 				// 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__, '{--WRONG_DB_SELECTED--}');
+				debug_report_bug(__FILE__, __LINE__, 'Wrong database selected.');
 			}
 		} else {
 			// No link to database!
-			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
+			debug_report_bug(__FILE__, __LINE__, 'Database link is not yet up.');
 		}
 	} else {
-		// Maybe you forgot to enter your MySQL data?
-		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
+		// Maybe you forgot to enter your database login?
+		debug_report_bug(__FILE__, __LINE__, 'Database login is missing.');
 	}
 } else {
 	// Default output is 'direct' for HTML output
@@ -152,7 +140,7 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	initMessages();
 
 	// Include more
-	foreach (array('databases','session','versions','install-functions','load_config','load_cache') as $inc) {
+	foreach (array('databases', 'session', 'versions', 'install-functions', 'load_config', 'load_cache') as $inc) {
 		// Load the include
 		loadIncludeOnce('inc/' . $inc . '.php');
 	} // END - foreach