X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=6a0ab78b379b22399fb7dd34f02ce7b377b2d8ba;hb=489aebca1753a3cefdbd331e83888b76e56dbb11;hp=5dcf9f06cf57dc65778c118b2fa20462f340a609;hpb=fc162164725588cf75969f707faead9c9cd8e68b;p=mailer.git

diff --git a/modules.php b/modules.php
index 5dcf9f06cf..6a0ab78b37 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,22 +54,15 @@ 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')) {
@@ -82,8 +73,10 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 	$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
@@ -98,6 +91,9 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 
 				// Module not found!
 				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
+
+				// Set module to error module (non-existent!)
+				setModule('error');
 			}
 			break;
 
@@ -111,11 +107,11 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 
 		case 'locked':
 			// Set HTTP status
-			setHttpStatus('403');
+			setHttpStatus('403 FORBIDDEN');
 
 			if (!isIncludeReadable($GLOBALS['module_inc'])) {
-				// Set HTTP status
-				setHttpStatus('404');
+				// Set HTTP status again
+				setHttpStatus('404 NOT FOUND');
 
 				// Module does addionally not exists
 				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
@@ -127,8 +123,8 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 
 		default:
 			// Unknown module status
-			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
-			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $check));
+			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 (!ifFatalErrorsDetected()) {