Configuration of advertisement networks prepared, CSS cleaned up, HTML rewritten:

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 57c3bed6392abe0b899d219bebcd239b0799bc1c..f89ea6c6e345a2fdc67997911f1658dd4c35bcc8 100644 (file)
--- a/modules.php
+++ b/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 *
@@ -55,15 +56,6 @@ require('inc/config-global.php');
 // Set content type
 setContentType('text/html');
 
-// Fix missing module to 'index'
-if (!isGetRequestElementSet('module')) {
-       // Set element
-       setRequestGetElement('module', 'index');
-
-       // ... and module
-       setModule('index');
-} // END - if
-
 // The header file
 loadIncludeOnce('inc/header.php');
 
@@ -75,8 +67,8 @@ $check = 'failed';
 // Is the maintenance mode active or goes all well?
 if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (!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());
 
@@ -88,37 +80,54 @@ if ((isExtensionActive('maintenance')) && (getConfig('maintenance') == 'Y') && (
                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') {
+                       } elseif (!ifFatalErrorsDetected()) {
+                               // Set HTTP status
+                               setHttpStatus('404');
+
                                // Module not found!
-                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
+
+                               // Set module to error module (non-existent!)
+                               setModule('error');
                        }
                        break;
 
                case '404':
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+                       // Set HTTP status
+                       setHttpStatus('404');
+
+                       // Add fatal message
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
                        break;
 
                case 'locked':
+                       // Set HTTP status
+                       setHttpStatus('403');
+
                        if (!isIncludeReadable($GLOBALS['module_inc'])) {
+                               // Set HTTP status
+                               setHttpStatus('404');
+
                                // Module does addionally not exists
-                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_404', getModule()));
+                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
                        } // END - if
 
                        // Add fatal message
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_LOCKED', getModule()));
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_IS_LOCKED', getModule()));
                        break;
 
                default:
+                       // Unknown module status
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('LANG_MOD_REG_UNKNOWN', $check));
+                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $check));
                        break;
        } // END - switch
-} elseif (getTotalFatalErrors() == '0') {
-       // MySQL problems!
-       addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
+} elseif (!ifFatalErrorsDetected()) {
+       // MySQL problems detected
+       addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {