X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=742fc6c5aa61ce4221d5ab5c735e52e69dc300c0;hb=3608f72d51e8126720024704398cf738e61f890b;hp=6180e3e9416df571a71fffe6e163713f1bb3fc0b;hpb=641ca2a3526aa0612781dddf83dd77dbb003adff;p=mailer.git

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 6180e3e941..742fc6c5aa 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -35,9 +35,9 @@
 if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
-} elseif ((!EXT_IS_ACTIVE("sql_patches", true)) && (!IS_ADMIN())) {
+} elseif (!EXT_IS_ACTIVE("sql_patches")) {
 	// The extension "sql_patches" *MUST* be activated or you have lot's of problems!
-	LOAD_URL("modules.php?module=admin");
+	LOAD_URL("admin.php");
 }
 
 // Load adverstising template
@@ -57,7 +57,7 @@ if (!empty($_GET['msg'])) {
 	// Which message shall we output?
 	switch ($_GET['msg']) {
 		case CODE_LOGOUT_DONE      : $msg = LOGOUT_DONE; break;
-		case CODE_LOGOUT_FAILED    : $msg = "<SPAN class=\"guest_failed\">".LOGOUT_FAILED."</SPAN>"; break;
+		case CODE_LOGOUT_FAILED    : $msg = "<span class=\"guest_failed\">".LOGOUT_FAILED."</span>"; break;
 		case CODE_DATA_INVALID     : $msg = MAIL_DATA_INVALID; break;
 		case CODE_POSSIBLE_INVALID : $msg = MAIL_POSSIBLE_INVALID; break;
 		case CODE_ACCOUNT_LOCKED   : $msg = MEMBER_ACCOUNT_LOCKED_UNC; break;
@@ -95,13 +95,10 @@ if (empty($GLOBALS['action'])) {
 	$GLOBALS['action'] = GET_ACTION("guest", $GLOBALS['what']);
 } // END - if
 
-// Get action value directly from URL
-$act = COMPILE_CODE($GLOBALS['action']);
-
 // Add the guest's menu here...
 if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// Show only when guest menu is active
-	ADD_MENU("guest", $act, $GLOBALS['what']);
+	ADD_MENU("guest", $GLOBALS['action'], $GLOBALS['what']);
 } // END - if
 
 // TDs between menu and content
@@ -110,8 +107,11 @@ LOAD_TEMPLATE("guest_menu_content");
 // Disable block-mode by default
 $BLOCK_MODE = false;
 
-$INC_ACTION = sprintf("%sinc/modules/guest/action-%s.php", PATH, $act);
-if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBALS['what']))) {
+// Construct FQFN
+$INC_ACTION = sprintf("%sinc/modules/guest/action-%s.php", PATH, $GLOBALS['action']);
+
+// Is the file there?
+if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
 	// Requested module is available so we load it
 	require_once($INC_ACTION);
 } else {