Several fixes and and improvements:

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index dcd2f45f012c8e439f131647d2f57bd07ed6f72e..e43f6869353d526f5fc19065bd60181383510bb8 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -48,6 +48,13 @@ LOAD_TEMPLATE("guest_header");
 
 // Add message here
 if (!empty($_GET['msg'])) {
+       // Default extension is "unknown"
+       $ext = "unknown";
+
+       // Is extension given?
+       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;
@@ -63,11 +70,6 @@ if (!empty($_GET['msg'])) {
                        break;
 
                case CODE_EXTENSION_PROBLEM:
-                       // Default extension is "unknown"
-                       $ext = "unknown";
-
-                       // Is extension given?
-                       if (!empty($_GET['ext'])) $ext = SQL_ESCAPE($_GET['ext']);
                        $msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, $ext);
                        break;
 
@@ -75,7 +77,7 @@ if (!empty($_GET['msg'])) {
                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
 
        // Load message template
        LOAD_TEMPLATE("message", false, $msg);