Hotfix

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 6a0ab78b379b22399fb7dd34f02ce7b377b2d8ba..78ab8920bce4cf7fd3cf7ef3e3882165f2edbf7c 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -45,100 +45,14 @@ require('inc/libs/security_functions.php');
 $GLOBALS['startTime'] = microtime(true);
 
 // Init output mode and module
-$GLOBALS['output_mode'] = '0';
 $GLOBALS['module'] = 'unknown';
+$GLOBALS['output_mode'] = '0';
 
 // Needed include files
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
-
-// The header file
-loadIncludeOnce('inc/header.php');
-
-// Modules are by default not valid!
-$isModuleValid = false;
-$URL = '';
-
-// 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')) {
-       // Maintain mode is active and you are no admin
-       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)
-       $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'])) && (!ifFatalErrorsDetected())) {
-                               // Module is valid, active and located on the local disc...
-                               $isModuleValid = true;
-                       } elseif (!ifFatalErrorsDetected()) {
-                               // Set HTTP status
-                               setHttpStatus('404');
-
-                               // Module not found!
-                               addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
-
-                               // Set module to error module (non-existent!)
-                               setModule('error');
-                       }
-                       break;
-
-               case '404':
-                       // Set HTTP status
-                       setHttpStatus('404');
-
-                       // Add fatal message
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
-                       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__, getMaskedMessage('MODULE_REGISTRY_404', getModule()));
-                       } // END - if
-
-                       // Add fatal message
-                       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", $moduleState, getModule()));
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $moduleState));
-                       break;
-       } // END - switch
-} elseif (!ifFatalErrorsDetected()) {
-       // MySQL problems detected
-       addFatalMessage(__FILE__, __LINE__, '{--MYSQL_ERRORS--}');
-}
-
-if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {
-       // Everything is okay so we can load the module
-       loadIncludeOnce($GLOBALS['module_inc']);
-} // END - if
-
-// Add the footer (this will call shutdown())
-loadIncludeOnce('inc/footer.php');
+// Include module
+doIncludeModule();
 
 // [EOF]
 ?>