Ref link fixed, nickname fixed, several rewrites, TODOs.txt updated:

[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 e44cb64794b98dd63d5a6922e0d91942064f0a13..07e592301c1f345e0dfb032aa14c8b2960a90dd7 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -41,9 +41,9 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
+       redirectToUrl('modules.php?module=index');
 } elseif ((!EXT_IS_ACTIVE('html_mail')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'html_mail');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('html_mail'));
        return;
 }
 
@@ -51,27 +51,34 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('member', __FILE__);
 
 // Class was found and loaded
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Save settings
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET html='%s' WHERE userid=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `html`='%s' WHERE `userid`=%s LIMIT 1",
                array(REQUEST_POST('html'), getUserId()), __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(getUserId()), __FILE__, __LINE__);
-       list($mode) = SQL_FETCHROW($result);
+
+       // Get the mode
+       $content = SQL_FETCHARRAY($result);
+
+       // Free result
        SQL_FREERESULT($result);
 
-       if ($mode == 'Y') {
-               define('HTML_Y', ' chkecked="checked"');
-               define('HTML_N', '');
+       // Prepare it
+       if ($content['html'] == 'Y') {
+               $content['html_y'] = ' checked="checked"';
+               $content['html_n'] = '');
        } else {
-               define('HTML_N', ' chkecked="checked"');
-               define('HTML_Y', '');
+               $content['html_n'] = ' checked="checked"';
+               $content['html_y'] = '';
        }
-       LOAD_TEMPLATE("member_html_mail_settings");
+
+       // Load main template
+       LOAD_TEMPLATE('member_html_mail_settings');
 }
 
-//
+// [EOF]
 ?>