X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-html_mail.php;h=462ef4152dc723a55a0f5ab468897b1ee8b8c4d5;hp=548b6f609d4131c086c2a089568b2ce48836058b;hb=f32d4d859d69b479791736bee7a5ea0ad550e523;hpb=b8c86fa12322603c24a88ea2b0fd3dbeba612752

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 548b6f609d..462ef4152d 100644
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -33,40 +38,44 @@
 
 // Some security stuff...
 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");
-} elseif ((!EXT_IS_ACTIVE("html_mail")) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "html_mail");
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('html_mail')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('html_mail'));
+	return;
+} // END - if
 
 // 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",
-		array(REQUEST_POST('html'), $GLOBALS['userid']), __FILE__, __LINE__);
-	LOAD_TEMPLATE("admin_settings_saved", false, getMessage('MEMBER_SETTINGS_SAVED'));
+	SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `html`='%s' WHERE `userid`=%s LIMIT 1",
+		array(postRequestElement('html'), getUserId()), __FILE__, __LINE__);
+	loadTemplate('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__);
-	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=\"checked\"");
-		define('HTML_N', "");
-	} else {
-		define('HTML_N', " checked=\"checked\"");
-		define('HTML_Y', "");
-	}
-	LOAD_TEMPLATE("member_html_mail_settings");
+	// Prepare it
+	$content['html_y'] = '';
+	$content['html_n'] = '';
+	$content['html_' . strtolower($content['html'])] = ' checked="checked"';
+
+	// Load main template
+	loadTemplate('member_html_mail_settings', false, $content);
 }
 
-//
+// [EOF]
 ?>