'userid' rewritten to functions

[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..447e84c824941b440eba3c742c2078922c88fc78 100644 (file)
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : HTML-Mails                                       *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -37,8 +42,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(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "html_mail");
        return;
 }
 
@@ -46,32 +51,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'), 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",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
+       $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);
        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");
 }
+
 //
 ?>