X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=modules.php;h=2b1b2acf75497a78a4f8f9fa8c6bd4d1e2d6cf35;hp=de90da0cd27fcd303e1d738d028138db2c093fea;hb=6f8a68c6c5ed9eeae1bf790f5d758c800b5d5d5d;hpb=16de7d9e8b98108627db01688bc095240b5ba8d2

diff --git a/modules.php b/modules.php
index de90da0cd2..2b1b2acf75 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                                      *
@@ -14,10 +14,9 @@
  * $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 - 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 *
@@ -37,7 +36,7 @@
  ************************************************************************/
 
 // XDEBUG call
-/* DEBUG: */ xdebug_start_trace();
+//* DEBUG: */ xdebug_start_trace();
 
 // Load security stuff here
 require('inc/libs/security_functions.php');
@@ -46,8 +45,8 @@ require('inc/libs/security_functions.php');
 $GLOBALS['startTime'] = microtime(true);
 
 // Init output mode and module
-$GLOBALS['output_mode'] = 0;
-$GLOBALS['module'] = '';
+$GLOBALS['output_mode'] = '0';
+$GLOBALS['module'] = 'unknown';
 
 // Needed include files
 require('inc/config-global.php');
@@ -55,64 +54,82 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
-// Fix missing module to 'index'
-if (!isGetRequestElementSet('module')) setRequestGetElement('module', 'index');
-
 // The header file
 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__, getMessage('LANG_DOWN_MAINTAINCE'));
-} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
+	addFatalMessage(__FILE__, __LINE__, '{--MAILER_DOWN_FOR_MAINTENANCE--}');
+} elseif ((SQL_IS_LINK_UP()) && (!ifFatalErrorsDetected())) {
 	// Construct module name
 	$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 'done': // All fine!
 			// Does the module exists on local file system?
-			if ((isIncludeReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == 0)) {
+			if ((isIncludeReadable($GLOBALS['module_inc'])) && (!ifFatalErrorsDetected())) {
 				// Module is valid, active and located on the local disc...
 				$isModuleValid = true;
-			} elseif (getTotalFatalErrors() == 0) {
-				// Module not found!
-				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+			} elseif (!ifFatalErrorsDetected()) {
+				// Set HTTP status
+				setHttpStatus('404');
+
+				// Module not found
+				addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
+
+				// Set module to error module (non-existent!)
+				setModule('error');
 			}
 			break;
 
 		case '404':
-			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+			// Set HTTP status
+			setHttpStatus('404');
+
+			// Add fatal message
+			addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
 			break;
 
 		case 'locked':
+			// Set HTTP status
+			setHttpStatus('403 FORBIDDEN');
+
 			if (!isIncludeReadable($GLOBALS['module_inc'])) {
+				// Set HTTP status again
+				setHttpStatus('404 NOT FOUND');
+
 				// Module does addionally not exists
-				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
+				addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_404--}');
 			} // END - if
 
 			// Add fatal message
-			addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_LOCKED'), getModule()));
+			addFatalMessage(__FILE__, __LINE__, '{--MODULE_REGISTRY_IS_LOCKED--}');
 			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));
+			// Unknown module status
+			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 (getTotalFatalErrors() == 0) {
-	// MySQL problems!
-	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+} elseif (!ifFatalErrorsDetected()) {
+	// SQL problems detected
+	addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {