* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
// Modules are by default not valid!
$isModuleValid = false;
$URL = '';
-$check = 'failed';
+
+// Init module state as 'failed' (always failed first)
+$moduleState = 'failed';
// Is the maintenance mode active or goes all well?
-if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!isAdmin()) && (getModule() != 'admin')) {
+if ((isExtensionActive('maintenance')) && (isMaintenanceEnabled()) && (!isAdmin()) && (getModule() != 'admin')) {
// Maintain mode is active and you are no admin
addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
$GLOBALS['module_inc'] = sprintf("inc/modules/%s.php", getModule());
// Check module permission (again)
- $check = checkModulePermissions();
- switch ($check) {
+ $moduleState = checkModulePermissions();
+
+ // Which permission/error state do we have?
+ switch ($moduleState) {
case 'cache_miss': // The cache is gone
case 'admin_only': // Admin-only access
case 'mem_only': // Member-only access
case 'locked':
// Set HTTP status
- setHttpStatus('403');
+ setHttpStatus('403 FORBIDDEN');
if (!isIncludeReadable($GLOBALS['module_inc'])) {
- // Set HTTP status
- setHttpStatus('404');
+ // Set HTTP status again
+ setHttpStatus('404 NOT FOUND');
// Module does addionally not exists
addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
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));
+ logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $moduleState, getModule()));
+ addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $moduleState));
break;
} // END - switch
} elseif (!ifFatalErrorsDetected()) {
- // MySQL problems detected
+ // SQL problems detected
addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
}