X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=9868be46fb946ee8c8709ce61f2c4babb2843e1e;hp=5437ef3e6ec225e67c9100d5f9fec57f3c3723f7;hb=aa1fa67e62e0d175d5d801becaea4362a5b50e2a;hpb=9afd6ec5878544a7982c50ed9c0dd7de37606d5b

diff --git a/modules.php b/modules.php
index 5437ef3e6e..9868be46fb 100644
--- a/modules.php
+++ b/modules.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 08/25/2003 *
- * ===============                              Last change: 07/01/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 08/25/2003 *
+ * ===================                          Last change: 07/01/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : modules.php                                      *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -47,7 +48,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 +57,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 +94,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') {