X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Findex.php;h=b74d1a162738cf88a05bde2061b1839502e13a94;hp=dee82df00ad1f9ad9a5578e08c539bd0624cd698;hb=4001187f22197f55e5a1f211fc8defcc180f7c32;hpb=0626c932e7b895a22f390523f4e6248ca77cfb98

diff --git a/inc/modules/index.php b/inc/modules/index.php
index dee82df00a..b74d1a1627 100644
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -47,37 +47,15 @@ define('__GUEST_ADVERT', LOAD_TEMPLATE("guest_advert", true));
 LOAD_TEMPLATE("guest_header");
 
 // Add message here
-if (!empty($_GET['msg'])) {
+if (REQUEST_ISSET_GET(('msg'))) {
 	// Default extension is "unknown"
 	$ext = "unknown";
 
 	// Is extension given?
-	if (!empty($_GET['ext'])) $ext = SQL_ESCAPE($_GET['ext']);
+	if (REQUEST_ISSET_GET(('ext'))) $ext = REQUEST_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(REQUEST_GET('msg'));
 
 	// Load message template
 	LOAD_TEMPLATE("message", false, $msg);
@@ -105,15 +83,15 @@ if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 LOAD_TEMPLATE("guest_menu_content");
 
 // Disable block-mode by default
-$BLOCK_MODE = false;
+$GLOBALS['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");