X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=5dcf9f06cf57dc65778c118b2fa20462f340a609;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=9bddeb8a605553566b18f83ea36d4feddb246474;hpb=7720eafcce1bf3996657d7cb1a748b51a706b425;p=mailer.git diff --git a/modules.php b/modules.php index 9bddeb8a60..5dcf9f06cf 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('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 +93,30 @@ 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())); } 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 +126,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']))) {