X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-connect.php;h=d10f8b3dc00c64cfe6f66492b2b3a6f2179c900a;hb=9b8fe454a575a1f000b00bc7ca37eaad6d59d21a;hp=e18c8cec126d799f2a042497a424bc603f193e16;hpb=c72268213d4d4829d845d39c101bb08fbe4ed79a;p=mailer.git

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index e18c8cec12..d10f8b3dc0 100644
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -14,11 +14,9 @@
  * $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                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,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
@@ -64,13 +62,15 @@ 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();
@@ -83,6 +83,9 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 	// Load database layer here
 	loadIncludeOnce('inc/db/lib.php');
 
+	// Init message system
+	initMessages();
+
 	// CSS array
 	initExtensionCssFiles();
 
@@ -105,20 +108,6 @@ 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--}');
@@ -128,19 +117,15 @@ if ((!isInstalling()) && (!isInstallationPhase())) {
 			addFatalMessage(__FILE__, __LINE__, '{--NO_DB_LINK--}');
 		}
 	} else {
-		// Maybe you forgot to enter your MySQL data?
+		// Maybe you forgot to enter your database login?
 		addFatalMessage(__FILE__, __LINE__, '{--MYSQL_DATA_MISSING--}');
 	}
 } 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 (getScriptOutputMode() == 1) {
+	if (isCssOutputMode()) {
 		// Problem with config so set output mode
 		setConfigEntry('OUTPUT_MODE', 'render');
 	} // END - if
@@ -148,21 +133,21 @@ 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/db/lib.php','inc/databases.php','inc/session.php','inc/versions.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 cache
-	loadIncludeOnce('inc/load_cache.php');
-
-	// Run the init filter chain
-	runFilterChain('init');
-
-	// Are we installation routine?
-	if ((!isInstalling()) && (getScriptOutputMode() != 1) && (getScriptOutputMode() != -1)) {
-		// You have to install first!
+	// Check wether we are in installation routine
+	if ((!isInstalling()) && (!isCssOutputMode()) && (!isRawOutputMode())) {
+		// Redirect to the URL
 		redirectToUrl('install.php');
 	} // END - if
 }