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

diff --git a/modules.php b/modules.php
index 4215f5c97c..bee4beae2c 100644
--- a/modules.php
+++ b/modules.php
@@ -35,7 +35,7 @@
 //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;
@@ -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();
@@ -94,7 +94,7 @@ if (IS_MEMBER()) {
 }
 
 // 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";
@@ -102,6 +102,9 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
 	// Maintain mode is active and you are no admin
 	addFatalMessage(getMessage('LANG_DOWN_MAINTAINCE'));
 } elseif (($link) && ($db) && (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,9 +112,6 @@ 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)) {
 			// Module is valid, active and located on the local disc...
@@ -129,7 +129,7 @@ if ((getConfig('maintenance') == "Y") && (!IS_ADMIN()) && ($GLOBALS['module'] !=
 		break;
 
 	case "locked":
-		if (!FILE_READABLE(PATH."inc/modules/".$GLOBALS['module'].".php")) {
+		if (!FILE_READABLE(__MODULE)) {
 			// Module does addionally not exists
 			addFatalMessage(LANG_MOD_REG_404_1.$GLOBALS['module'].LANG_MOD_REG_404_2);
 		} // END - if
@@ -154,11 +154,11 @@ if (($MOD_VALID) && (defined('__MODULE'))) {
 	/////////////////////////////////////////////
 	//
 	// Everything is okay so we can load the module
-	include (__MODULE);
+	LOAD_INC_ONCE(__MODULE);
 } // END - if
 
 // Next-to-end add the footer
-require_once(PATH."inc/footer.php");
+LOAD_INC_ONCE("inc/footer.php");
 
 //
 ?>