X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=8ca5c6cf014d7452bcd4cbca87de777cb60e2d2a;hb=0226aea588ae0b433e4c2c17b23f79885c2d0da5;hp=742fc6c5aa61ce4221d5ab5c735e52e69dc300c0;hpb=ac04130f9ccbaba51d7d7992d8a10c38db776eee;p=mailer.git

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 742fc6c5aa..8ca5c6cf01 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -55,29 +55,7 @@ if (!empty($_GET['msg'])) {
 	if (!empty($_GET['ext'])) $ext = SQL_ESCAPE($_GET['ext']);
 
 	// 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_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;
-		case CODE_USER_404         : $msg = USER_NOT_FOUND; break;
-		case CODE_STATS_404        : $msg = MAIL_STATS_404; break;
-		case CODE_ALREADY_CONFIRMED: $msg = MAIL_ALREADY_CONFIRMED; break;
-
-		case CODE_ERROR_MAILID:
-			if (EXT_IS_ACTIVE($ext, true)) { $msg = ERROR_CONFIRMING_MAIL; } else { $msg = sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"); }
-			break;
-
-		case CODE_EXTENSION_PROBLEM:
-			$msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, $ext);
-			break;
-
-		case CODE_COOKIES_DISABLED : $msg = LOGIN_NO_COOKIES; break;
-		case CODE_BEG_SAME_AS_OWN  : $msg = BEG_SAME_UID_AS_OWN; break;
-		case CODE_LOGIN_FAILED     : $msg = LOGIN_FAILED_GENERAL; break;
-		default                    : $msg = UNKNOWN_MAILID_CODE_1.$_GET['msg'].UNKNOWN_MAILID_CODE_2; break;
-	} // END - switch
+	$msg = convertCodeToMessage($_GET['msg']);
 
 	// Load message template
 	LOAD_TEMPLATE("message", false, $msg);
@@ -108,12 +86,12 @@ LOAD_TEMPLATE("guest_menu_content");
 $BLOCK_MODE = false;
 
 // Construct FQFN
-$INC_ACTION = sprintf("%sinc/modules/guest/action-%s.php", PATH, $GLOBALS['action']);
+$INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);
 
 // Is the file there?
-if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
+if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("guest", $GLOBALS['action'], $GLOBALS['what']))) {
 	// Requested module is available so we load it
-	require_once($INC_ACTION);
+	LOAD_INC_ONCE($INC);
 } else {
 	// Invalid module specified or not found...
 	LOAD_URL("modules.php?module=index");
@@ -126,8 +104,8 @@ if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 	// Some advertising stuff?
 	LOAD_TEMPLATE("guest_advert2");
 
-	OUTPUT_HTML("  </TD>
-</TR>");
+	OUTPUT_HTML("  </td>
+</tr>");
 
 	// Goto TOP template
 	LOAD_TEMPLATE("guest_goto_top");