Variable renamed, function refactured/moved:

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 4f49e79ec114c42059ce86e62b3af469907b5483..3b6905a4ec08233841ebb512d81c966289cdd97f 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -60,7 +60,9 @@ 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')) {
@@ -71,8 +73,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
@@ -119,8 +123,8 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
 
                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()) {