Complete rewrite of and , wrapper functions added, see bug #101

[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 6944df89680fba4257518644860a36e88d5faa7f..e7b9337df4e2c005dbcbea23ff074eb0de2d812a 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -38,7 +38,7 @@ if (!defined('__SECURITY')) {
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
 } elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "html_mail");
        return;
 }
 
@@ -46,32 +46,27 @@ if (!defined('__SECURITY')) {
 ADD_DESCR("member", __FILE__);
 
 // Class was found and loaded
-if (isset($_POST['ok']))
-{
+if (IS_FORM_SENT()) {
        // Save settings
-       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET html='%s' WHERE userid=%s LIMIT 1",
-        array($_POST['html'], $GLOBALS['userid']), __FILE__, __LINE__);
-       LOAD_TEMPLATE("admin_settings_saved", false, MEMBER_SETTINGS_SAVED);
-}
- else
-{
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET html='%s' WHERE userid=%s LIMIT 1",
+               array(REQUEST_POST('html'), $GLOBALS['userid']), __FILE__, __LINE__);
+       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SETTINGS_SAVED'));
+} else {
        // Load template for changing settings
-       $result = SQL_QUERY_ESC("SELECT html FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT html FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+               array($GLOBALS['userid']), __FILE__, __LINE__);
        list($mode) = SQL_FETCHROW($result);
        SQL_FREERESULT($result);
 
-       if ($mode == "Y")
-       {
+       if ($mode == "Y") {
                define('HTML_Y', " checked=\"checked\"");
                define('HTML_N', "");
-       }
-        else
-       {
+       } else {
                define('HTML_N', " checked=\"checked\"");
                define('HTML_Y', "");
        }
        LOAD_TEMPLATE("member_html_mail_settings");
 }
+
 //
 ?>