X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=446ffe9cd360f67285f0ccf7e273599ca3ade983;hp=f2d1639a6c88f7e1554c53df40caec2c1f67dcbd;hb=1551e5820800685c80c19871a376986c0ad6f0f6;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69

diff --git a/modules.php b/modules.php
index f2d1639a6c..446ffe9cd3 100644
--- a/modules.php
+++ b/modules.php
@@ -76,7 +76,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('LANG_DOWN_MAINTAINCE'));
+	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,33 +93,50 @@ 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('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');
+
 			if (!isIncludeReadable($GLOBALS['module_inc'])) {
+				// Set HTTP status
+				setHttpStatus('404');
+
 				// 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:
+			// Unknown module status
 			logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
-			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check));
+			addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $check));
 			break;
 	} // END - switch
 } elseif (!ifFatalErrorsDetected()) {
-	// MySQL problems!
-	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+	// MySQL problems detected
+	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {