GigaPromo now fully integrated

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 7e8a0b2ea9657d6cbacc8cd7557a5c0a0ac96b90..7677838a0cb47d3b4362c032073cdb01f9938483 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -47,7 +47,7 @@ $GLOBALS['startTime'] = microtime(true);
 
 // Init output mode and module
 $GLOBALS['output_mode'] = '0';
-$GLOBALS['module'] = '';
+$GLOBALS['module'] = 'unknown';
 
 // Needed include files
 require('inc/config-global.php');
@@ -56,7 +56,13 @@ require('inc/config-global.php');
 setContentType('text/html');
 
 // Fix missing module to 'index'
-if (!isGetRequestElementSet('module')) setRequestGetElement('module', 'index');
+if (!isGetRequestParameterSet('module')) {
+       // Set element
+       setGetRequestParameter('module', 'index');
+
+       // ... and module
+       setModule('index');
+} // END - if
 
 // The header file
 loadIncludeOnce('inc/header.php');
@@ -87,27 +93,27 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                                $isModuleValid = true;
                        } elseif (getTotalFatalErrors() == '0') {
                                // Module not found!
-                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
                        }
                        break;
 
                case '404':
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
                        break;
 
                case 'locked':
                        if (!isIncludeReadable($GLOBALS['module_inc'])) {
                                // Module does addionally not exists
-                               addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
                        } // END - if
 
                        // Add fatal message
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), getModule()));
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_LOCKED', getModule()));
                        break;
 
                default:
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
-                       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check));
                        break;
        } // END - switch
 } elseif (getTotalFatalErrors() == '0') {