X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=modules.php;h=201f4cea38975f4dc895629353222dc2eed5e121;hb=c96e955563e69bf89daf10cbde8a77d73950e9a1;hp=ade12602091f1f9626d83c713a77fa6c401da7e8;hpb=61dec4b03dbfb49cbbeb19628d966c6e34f3b59a;p=mailer.git

diff --git a/modules.php b/modules.php
index ade1260209..201f4cea38 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                                      *
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
  ************************************************************************/
 
 // XDEBUG call
-//xdebug_start_trace();
+//* DEBUG: */ xdebug_start_trace();
 
 // Load security stuff here
 require('inc/libs/security_functions.php');
@@ -46,44 +46,53 @@ 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');
 
+// Set content type
+setContentType('text/html');
+
 // Fix missing module to 'index'
-if (!REQUEST_ISSET_GET('module')) REQUEST_SET_GET('module', 'index');
+if (!isGetRequestElementSet('module')) {
+	// Set element
+	setRequestGetElement('module', 'index');
+
+	// ... and module
+	setModule('index');
+} // END - if
 
 // The header file
 loadIncludeOnce('inc/header.php');
 
 // Modules are by default not valid!
-$isModuleValid = false; $check = 'failed';
+$isModuleValid = false;
+$URL = '';
+$check = 'failed';
 
 // Is the maintenance mode active or goes all well?
-if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && (getModule() != 'admin')) {
+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)) {
+} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == '0')) {
 	// Construct module name
-	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", SQL_ESCAPE(getModule()));
+	$GLOBALS['module_inc'] =  sprintf("inc/modules/%s.php", getModule());
 
-	// Did we found the module listed in allowed modules and are we successfully connected?
-	$check = checkModulePermissions(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 ((isFileReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == 0)) {
+			if ((isIncludeReadable($GLOBALS['module_inc'])) && (getTotalFatalErrors() == '0')) {
 				// Module is valid, active and located on the local disc...
 				$isModuleValid = true;
-			} elseif (!empty($URL)) {
-				// An URL was specified so we load the de-referrer module
-				redirectToUrl(DEREFERER($URL));
-			} elseif (getTotalFatalErrors() == 0) {
+			} elseif (getTotalFatalErrors() == '0') {
+				// Module not found!
 				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
 			}
 			break;
@@ -93,7 +102,7 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && (getModule() != 'admin
 			break;
 
 		case 'locked':
-			if (!isFileReadable($GLOBALS['module_inc'])) {
+			if (!isIncludeReadable($GLOBALS['module_inc'])) {
 				// Module does addionally not exists
 				addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('LANG_MOD_REG_404'), getModule()));
 			} // END - if
@@ -103,26 +112,22 @@ if ((getConfig('maintenance') == 'Y') && (!IS_ADMIN()) && (getModule() != 'admin
 			break;
 
 		default:
-			DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, getModule()));
+			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));
 			break;
-	}
-} elseif (getTotalFatalErrors() == 0) {
+	} // END - switch
+} elseif (getTotalFatalErrors() == '0') {
 	// MySQL problems!
 	addFatalMessage(__FILE__, __LINE__, getMessage('MYSQL_ERRORS'));
 }
 
 if (($isModuleValid === true) && (isset($GLOBALS['module_inc']))) {
-	/////////////////////////////////////////////
-	// Main including line DO NOT REMOVE/EDIT! //
-	/////////////////////////////////////////////
-	//
 	// Everything is okay so we can load the module
 	loadIncludeOnce($GLOBALS['module_inc']);
 } // END - if
 
-// Next-to-end add the footer
+// Add the footer (this will call shutdown())
 loadIncludeOnce('inc/footer.php');
 
-//
+// [EOF]
 ?>