X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=f89ea6c6e345a2fdc67997911f1658dd4c35bcc8;hb=5736dfb1b51bff78b3594a166f350e76784fa0ff;hp=9bddeb8a605553566b18f83ea36d4feddb246474;hpb=ed802824b87b9dc2797f0064d9096714f0613ae0;p=mailer.git

diff --git a/modules.php b/modules.php
index 9bddeb8a60..f89ea6c6e3 100644
--- a/modules.php
+++ b/modules.php
@@ -56,15 +56,6 @@ 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');
 
@@ -76,7 +67,7 @@ $check = 'failed';
 // Is the maintenance mode active or goes all well?
 if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) {
 	// Maintain mode is active and you are no admin
-	addFatalMessage(__FILE__, __LINE__, getMessage('MAILER_DOWN_FOR_MAINTENANCE'));
+	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());
@@ -93,17 +84,33 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 				// Module is valid, active and located on the local disc...
 				$isModuleValid = true;
 			} elseif (!ifFatalErrorsDetected()) {
+				// Set HTTP status
+				setHttpStatus('404');
+
 				// Module not found!
 				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
+
+				// Set module to error module (non-existent!)
+				setModule('error');
 			}
 			break;
 
 		case '404':
+			// Set HTTP status
+			setHttpStatus('404');
+
+			// Add fatal message
 			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
 			break;
 
 		case 'locked':
+			// Set HTTP status
+			setHttpStatus('403');
+
 			if (!isIncludeReadable($GLOBALS['module_inc'])) {
+				// Set HTTP status
+				setHttpStatus('404');
+
 				// Module does addionally not exists
 				addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
 			} // END - if
@@ -113,13 +120,14 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 			break;
 
 		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));
 			break;
 	} // END - switch
 } elseif (!ifFatalErrorsDetected()) {
 	// MySQL problems detected
-	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {