Again some fixes:

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

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 366c6d16c7db47a46d1b6802ab9ebcc8fe9828e0..191ca68d942a92516f243970a0642454949f04f3 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)) {
@@ -57,8 +57,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:
+                       // 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;
+
                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;