Frameset support entirely removed, TODO extended, minor template fix

[mailer.git] / inc / modules / member / what-html_mail.php

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index ad798d6fe62a2de246bcbf30753c1a7a52da6868..6944df89680fba4257518644860a36e88d5faa7f 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -32,23 +32,18 @@
  ************************************************************************/
 
 // 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 (!IS_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN()))
-{
+} elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
+ADD_DESCR("member", __FILE__);
 
 // Class was found and loaded
 if (isset($_POST['ok']))
@@ -68,12 +63,12 @@ if (isset($_POST['ok']))
 
        if ($mode == "Y")
        {
-               define('HTML_Y', ' checked');
+               define('HTML_Y', " checked=\"checked\"");
                define('HTML_N', "");
        }
         else
        {
-               define('HTML_N', ' checked');
+               define('HTML_N', " checked=\"checked\"");
                define('HTML_Y', "");
        }
        LOAD_TEMPLATE("member_html_mail_settings");