Several fixes and and improvements:

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 366c6d16c7db47a46d1b6802ab9ebcc8fe9828e0..e43f6869353d526f5fc19065bd60181383510bb8 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 } elseif (!EXT_IS_ACTIVE("sql_patches", true)) {
@@ -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;
@@ -57,13 +64,20 @@ if (!empty($_GET['msg'])) {
                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("mailid", true)) { $msg = ERROR_CONFIRMING_MAIL; } else { $msg = sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "mailid"); } break;
-               case CODE_EXTENSION_PROBLEM: $msg = sprintf(EXTENSION_PROBLEM_EXT_INACTIVE, "mailid"); 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
 
        // Load message template
        LOAD_TEMPLATE("message", false, $msg);
@@ -103,7 +117,7 @@ if ((FILE_READABLE($INC_ACTION)) && (VALIDATE_MENU_ACTION("guest", $act, $GLOBAL
 }
 
 if (($_CONFIG['guest_menu'] == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
-       // TDs between content and </table>
+       // Right side of content (hint: a good place for 120x600 skyscraper banner!)
        LOAD_TEMPLATE("guest_content_footer");
 
        // Some advertising stuff?