X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=modules.php;h=3a95d923ba0e1db9193fbacde8d79f92632cdb90;hb=4f81f03880adee27e96f05d5d9921f717fd9d938;hp=4215f5c97c175d4d0b288aaf0730e0a2baac330d;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/modules.php b/modules.php
index 4215f5c97c..3a95d923ba 100644
--- a/modules.php
+++ b/modules.php
@@ -35,24 +35,24 @@
 //xdebug_start_trace();
 
 // Load security stuff here (Oh, I hope this is not unsecure? Am I paranoia??? ;-) )
-require_once("inc/libs/security_functions.php");
+require("inc/libs/security_functions.php");
 
 // Init "action" and "what"
-global $what, $action, $startTime;
 $GLOBALS['startTime'] = microtime(true);
-$CSS = 0;
-$GLOBALS['what'] = ""; $GLOBALS['action'] = "";
+$GLOBALS['output_mode'] = 0;
+$GLOBALS['what']   = "";
+$GLOBALS['action'] = "";
 $GLOBALS['userid'] = 0;
 
 // Fix missing module to "index"
-if (empty($_GET['module'])) $_GET['module'] = "index";
+if (!REQUEST_ISSET_GET(('module'))) REQUEST_SET_GET('module', "index");
 
 // Secure action/what if present
-if (!empty($_GET['action'])) $GLOBALS['action'] = secureString($_GET['action']);
-if (!empty($_GET['what'])) $GLOBALS['what'] = secureString($_GET['what']);
+if (REQUEST_ISSET_GET(('action'))) $GLOBALS['action'] = secureString(REQUEST_GET('action'));
+if (REQUEST_ISSET_GET(('what')))   $GLOBALS['what']   = secureString(REQUEST_GET('what'));
 
 // Secure the module name (very important line!)
-$GLOBALS['module'] = secureString($_GET['module']);
+$GLOBALS['module'] = secureString(REQUEST_GET('module'));
 
 // Needed include files
 require("inc/config.php");
@@ -70,11 +70,11 @@ if (IS_MEMBER()) {
 		// Additionally admin?
 		if (IS_ADMIN()) {
 			// Add it
-			$username .= " ("._ADMIN_SHORT.")";
+			$username .= " ({!_ADMIN_SHORT!})";
 		} // END - if
 	} else {
 		// Hmmm, logged in and no valid userid?
-		$username = "<em>"._UNKNOWN."</em>";
+		$username = "<em>{!_UNKNOWN!}</em>";
 
 		// Destroy session
 		destroy_user_session();
@@ -87,21 +87,24 @@ if (IS_MEMBER()) {
 	SQL_FREERESULT($result);
 } elseif (IS_ADMIN()) {
 	// Admin is there
-	$username = _ADMIN;
+	$username = getMessage('_ADMIN');
 } else {
 	// He's a guest, hello there... ;-)
-	$username = _GUEST;
+	$username = getMessage('_GUEST');
 }
 
 // The header file
-require_once(PATH."inc/header.php");
+LOAD_INC_ONCE("inc/header.php");
 
 // Modules are by default not valid!
 $MOD_VALID = false; $check = "failed";
 if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] != "admin")) {
 	// Maintain mode is active and you are no admin
 	addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
-} elseif (($link) && ($db) && (getTotalFatalErrors() == 0)) {
+} elseif ((SQL_IS_LINK_UP()) && (getTotalFatalErrors() == 0)) {
+	// Construct module name
+	define('__MODULE', sprintf("inc/modules/%s.php", SQL_ESCAPE($GLOBALS['module'])));
+
 	// Did we found the module listed in allowed modules and are we successfully connected?
 	$check = CHECK_MODULE($GLOBALS['module']);
 	switch ($check)
@@ -109,38 +112,35 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
 	case "admin_only":
 	case "mem_only":
 	case "done":
-		// Construct module name
-		define('__MODULE', sprintf("%sinc/modules/%s.php", PATH, SQL_ESCAPE($GLOBALS['module'])));
-
 		// Does the module exists on local file system?
-		if ((FILE_READABLE(__MODULE)) && (getTotalFatalErrors() == 0)) {
+		if ((FILE_READABLE(constant('__MODULE'))) && (getTotalFatalErrors() == 0)) {
 			// Module is valid, active and located on the local disc...
 			$MOD_VALID = true;
 		} elseif (!empty($URL)) {
 			// An URL was specified so we load the de-referrer module
 			LOAD_URL(DEREFERER($URL));
 		} elseif (getTotalFatalErrors() == 0) {
-			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		}
 		break;
 
 	case "404":
-		addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		break;
 
 	case "locked":
-		if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
+		if (!FILE_READABLE(constant('__MODULE'))) {
 			// Module does addionally not exists
-			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
+			addFatalMessage(sprintf(getMessage('LANG_MOD_REG_404'), $GLOBALS['module']));
 		} // END - if
 
 		// Add fatal message
-		addFatalMessage(LANG_MOD_LOCKED_1.$GLOBALS['module'].LANG_MOD_LOCKED_2);
+		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_LOCKED'), $GLOBALS['module']));
 		break;
 
 	default:
 		DEBUG_LOG(__FILE__, __LINE__, sprintf("Unknown status %s return from module check. Module=%s", $check, $GLOBALS['module']));
-		addFatalMessage(LANG_MOD_UNKNOWN_1.$check.LANG_MOD_UNKNOWN_2);
+		addFatalMessage(sprintf(getMessage('LANG_MOD_REG_UNKNOWN'), $check));
 		break;
 	}
 } elseif (getTotalFatalErrors() == 0) {
@@ -154,11 +154,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
 	/////////////////////////////////////////////
 	//
 	// Everything is okay so we can load the module
-	include (__MODULE);
+	LOAD_INC_ONCE(constant('__MODULE'));
 } // END - if
 
 // Next-to-end add the footer
-require_once(PATH."inc/footer.php");
+LOAD_INC_ONCE("inc/footer.php");
 
 //
 ?>