X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=09fef371356da546aa1a7951a32f55c8a8a42d18;hp=ac2fd8cd3d4e12f7615a66986a1832db00016ab1;hb=ebcae81718f4fd253a51330a798a90eadbbe0ab5;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2 diff --git a/modules.php b/modules.php index ac2fd8cd3d..09fef37135 100644 --- a/modules.php +++ b/modules.php @@ -59,7 +59,6 @@ loadIncludeOnce('inc/header.php'); // Modules are by default not valid! $isModuleValid = false; -$URL = ''; // Init module state as 'failed' (always failed first) $moduleState = 'failed'; @@ -89,8 +88,8 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( // Set HTTP status setHttpStatus('404'); - // Module not found! - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + // Module not found + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); // Set module to error module (non-existent!) setModule('error'); @@ -102,7 +101,7 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( setHttpStatus('404'); // Add fatal message - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); break; case 'locked': @@ -114,17 +113,17 @@ if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin( setHttpStatus('404 NOT FOUND'); // Module does addionally not exists - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}'); } // END - if // Add fatal message - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_IS_LOCKED', getModule())); + addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_IS_LOCKED--}'); break; default: // Unknown module status logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule())); - addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $moduleState)); + addFatalMessage(__FILE__, __LINE__, '{%message,UNKNOWN_MODULE_STATUS=' . $moduleState . '%}'); break; } // END - switch } elseif (!ifFatalErrorsDetected()) {