X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=fbcc2ff8bc4c10e71125b05da6d46cbff5b482ac;hp=9868be46fb946ee8c8709ce61f2c4babb2843e1e;hb=1eb64bc7e998066030c009641032a4475f7222da;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa

diff --git a/modules.php b/modules.php
index 9868be46fb..fbcc2ff8bc 100644
--- a/modules.php
+++ b/modules.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -56,70 +54,82 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
-// Fix missing module to 'index'
-if (!isGetRequestParameterSet('module')) {
-	// Set element
-	setGetRequestParameter('module', 'index');
-
-	// ... and module
-	setModule('index');
-} // END - if
-
 // The header file
 loadIncludeOnce('inc/header.php');
 
 // Modules are by default not valid!
 $isModuleValid = false;
 $URL = '';
-$check = 'failed';
+
+// Init module state as 'failed' (always failed first)
+$moduleState = 'failed';
 
 // Is the maintenance mode active or goes all well?
-if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) {
+if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin()) && (getModule() != 'admin')) {
 	// Maintain mode is active and you are no admin
-	addFatalMessage(__FILE__, __LINE__, getMessage('LANG_DOWN_MAINTAINCE'));
-} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == '0')) {
+	addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
+} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
 	// Construct module name
 	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
 
 	// Check module permission (again)
-	$check = checkModulePermissions();
-	switch ($check) {
+	$moduleState = checkModulePermissions();
+
+	// Which permission/error state do we have?
+	switch ($moduleState) {
 		case 'cache_miss': // The cache is gone
 		case 'admin_only': // Admin-only access
 		case 'mem_only': // Member-only access
 		case 'done': // All fine!
 			// Does the module exists on local file system?
-			if ((isIncludeReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == '0')) {
+			if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
 				// Module is valid, active and located on the local disc...
 				$isModuleValid = true;
-			} elseif (getTotalFatalErrors() == '0') {
+			} elseif (!ifFatalErrorsDetected()) {
+				// Set HTTP status
+				setHttpStatus('404');
+
 				// Module not found!
-				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
+
+				// Set module to error module (non-existent!)
+				setModule('error');
 			}
 			break;
 
 		case '404':
-			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+			// Set HTTP status
+			setHttpStatus('404');
+
+			// Add fatal message
+			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
 			break;
 
 		case 'locked':
+			// Set HTTP status
+			setHttpStatus('403 FORBIDDEN');
+
 			if (!isIncludeReadable($GLOBALS['module_inc'])) {
+				// Set HTTP status again
+				setHttpStatus('404 NOT FOUND');
+
 				// Module does addionally not exists
-				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
 			} // END - if
 
 			// Add fatal message
-			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_LOCKED', getModule()));
+			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_IS_LOCKED', getModule()));
 			break;
 
 		default:
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
-			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check));
+			// Unknown module status
+			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule()));
+			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $moduleState));
 			break;
 	} // END - switch
-} elseif (getTotalFatalErrors() == '0') {
-	// MySQL problems!
-	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+} elseif (!ifFatalErrorsDetected()) {
+	// MySQL problems detected
+	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {