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 2baa95b8d61769451edf6ab0d17ef4058d6afa6e..07e592301c1f345e0dfb032aa14c8b2960a90dd7 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::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                  *
@@ -32,51 +37,48 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-       LOAD_URL(URL."/modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN()))
-{
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "html_mail");
+} elseif (!IS_MEMBER()) {
+       redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('html_mail')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('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']))
-{
+if (isFormSent()) {
        // Save settings
-       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET html='%s' WHERE userid=%d 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=%d LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
-       list($mode) = SQL_FETCHROW($result);
+       $result = SQL_QUERY_ESC("SELECT `html` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
+               array(getUserId()), __FILE__, __LINE__);
+
+       // Get the mode
+       $content = SQL_FETCHARRAY($result);
+
+       // Free result
        SQL_FREERESULT($result);
 
-       if ($mode == "Y")
-       {
-               define('HTML_Y', " checked");
-               define('HTML_N', "");
-       }
-        else
-       {
-               define('HTML_N', " checked");
-               define('HTML_Y', "");
+       // Prepare it
+       if ($content['html'] == 'Y') {
+               $content['html_y'] = ' checked="checked"';
+               $content['html_n'] = '');
+       } else {
+               $content['html_n'] = ' checked="checked"';
+               $content['html_y'] = '';
        }
-       LOAD_TEMPLATE("member_html_mail_settings");
+
+       // Load main template
+       LOAD_TEMPLATE('member_html_mail_settings');
 }
-//
+
+// [EOF]
 ?>