Two tickets resolved (57/89)

[mailer.git] / inc / modules / index.php

diff --git a/inc/modules/index.php b/inc/modules/index.php
index dee82df00ad1f9ad9a5578e08c539bd0624cd698..27111a3f10b3b72ff64de8f1a7bdd80bb160e0f1 100644 (file)
--- 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 ((FILE_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");