X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=modules.php;h=6a0ab78b379b22399fb7dd34f02ce7b377b2d8ba;hb=626d46112349bc87ad5f64b8c16d9954144bff07;hp=4f49e79ec114c42059ce86e62b3af469907b5483;hpb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;p=mailer.git

diff --git a/modules.php b/modules.php
index 4f49e79ec1..6a0ab78b37 100644
--- a/modules.php
+++ b/modules.php
@@ -60,7 +60,9 @@ 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')) {
@@ -71,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
@@ -103,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()));
@@ -119,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()) {