More variables renamed to , install/admin_WriteData() is now generic (with open TODO)

[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 545aa1d375cc7837c3de3078a33f48e2a687e686..af47b72b987fe807b42a5773ed36f4f1dc647214 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -37,8 +37,8 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif (!EXT_IS_ACTIVE("html_mail")) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
+} elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
+       addFatalMessage(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "html_mail");
        return;
 }
 
@@ -49,14 +49,14 @@ ADD_DESCR("member", __FILE__);
 if (isset($_POST['ok']))
 {
        // 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);
+       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, 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",
+       $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);