X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Findex.php;h=dee82df00ad1f9ad9a5578e08c539bd0624cd698;hb=62b16291efe168636f5eda2c8644f6770382fb1e;hp=1ac4b9912201c555477ac536573a69c6802d4e8e;hpb=939bce138060b727dc96764df88fbb8e4e7049c7;p=mailer.git

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 1ac4b99122..dee82df00a 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)) {
+} 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;
@@ -87,21 +87,18 @@ if (!empty($_GET['msg'])) {
 LOAD_TEMPLATE("guest_menu_td");
 
 // When no what value is provided take the "home" value
-if (empty($GLOBALS['what'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+if (empty($GLOBALS['what'])) $GLOBALS['what'] = getConfig('index_home');
 
 // Adding the main content module here
 if (empty($GLOBALS['action'])) {
 	// Get action value from what value
-	$act = GET_ACTION("guest", $GLOBALS['what']);
-} else {
-	// Get action value directly from URL
-	$act = COMPILE_CODE($GLOBALS['action']);
-}
+	$GLOBALS['action'] = GET_ACTION("guest", $GLOBALS['what']);
+} // END - if
 
 // Add the guest's menu here...
-if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+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 {
@@ -119,15 +119,15 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBAL
 	LOAD_URL("modules.php?module=index");
 }
 
-if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
+if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// Right side of content (hint: a good place for 120x600 skyscraper banner!)
 	LOAD_TEMPLATE("guest_content_footer");
 
 	// Some advertising stuff?
 	LOAD_TEMPLATE("guest_advert2");
 
-	OUTPUT_HTML("  </TD>
-</TR>");
+	OUTPUT_HTML("  </td>
+</tr>");
 
 	// Goto TOP template
 	LOAD_TEMPLATE("guest_goto_top");