Way more usage of EL code:

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 4f49e79ec114c42059ce86e62b3af469907b5483..09fef371356da546aa1a7951a32f55c8a8a42d18 100644 (file)
--- 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,11 +59,12 @@ loadIncludeOnce('inc/header.php');
 
 // 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())) {
@@ -71,8 +72,10 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
        $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
@@ -85,8 +88,8 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                                // 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');
@@ -98,33 +101,33 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                        setHttpStatus('404');
 
                        // Add fatal message
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
+                       addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
                        break;
 
                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()));
+                               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", $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__, '{%message,UNKNOWN_MODULE_STATUS=' . $moduleState . '%}');
                        break;
        } // END - switch
 } elseif (!ifFatalErrorsDetected()) {
-       // MySQL problems detected
+       // SQL problems detected
        addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }