Added more wrapper, commented out another noisy debug line

[mailer.git] / modules.php

diff --git a/modules.php b/modules.php
index 5dcf9f06cf57dc65778c118b2fa20462f340a609..280bd0f12481754250713633f677cbdde2ae94f8 100644 (file)
--- a/modules.php
+++ b/modules.php
@@ -14,12 +14,10 @@
  * $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, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 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 *
@@ -44,105 +42,17 @@
 require('inc/libs/security_functions.php');
 
 // Init start time
-$GLOBALS['startTime'] = microtime(true);
+$GLOBALS['__start_time'] = microtime(true);
 
 // Init output mode and module
-$GLOBALS['output_mode'] = '0';
-$GLOBALS['module'] = 'unknown';
+$GLOBALS['__module']      = 'unknown';
+$GLOBALS['__output_mode'] = '0';
 
 // Needed include files
 require('inc/config-global.php');
 
-// Set content type
-setContentType('text/html');
-
-// Fix missing module to 'index'
-if (!isGetRequestParameterSet('module')) {
-       // Set element
-       setGetRequestParameter('module', 'index');
-
-       // ... and module
-       setModule('index');
-} // END - if
-
-// The header file
-loadIncludeOnce('inc/header.php');
-
-// Modules are by default not valid!
-$isModuleValid = false;
-$URL = '';
-$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__, '{--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) {
-               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()));
-                       }
-                       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');
-
-                       if (!isIncludeReadable($GLOBALS['module_inc'])) {
-                               // Set HTTP status
-                               setHttpStatus('404');
-
-                               // 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", $check, getModule()));
-                       addFatalMessage(__FILE__, __LINE__, getMaskedMessage('UNKNOWN_MODULE_STATUS', $check));
-                       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]
 ?>