X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=09fef371356da546aa1a7951a32f55c8a8a42d18;hb=292fb7189065e26f9ad5f1d7d90245bd103de000;hp=826deb7789bfcc641266452b1c21c83182c3acc2;hpb=5d89789720c77e954b2eba28c00ec710dd28900d;p=mailer.git diff --git a/modules.php b/modules.php index 826deb7789..09fef37135 100644 --- a/modules.php +++ b/modules.php @@ -16,7 +16,7 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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_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()) {