X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-html_mail.php;h=7ca346b0d246a1d380147780087d4aa303b20713;hb=e6d0294f587cab6b74f689ecdf2ebb3cf2b09e25;hp=07e592301c1f345e0dfb032aa14c8b2960a90dd7;hpb=650f9bb32a2e60a78501b498ba7c4930405e5b6b;p=mailer.git

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 07e592301c..7ca346b0d2 100644
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -17,7 +17,7 @@
  * 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 *
@@ -38,27 +38,28 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('html_mail')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('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 (isFormSent()) {
 	// Save settings
-	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'));
+	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",
+	$result = SQL_QUERY_ESC("SELECT `html` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
 		array(getUserId()), __FILE__, __LINE__);
 
 	// Get the mode
@@ -68,16 +69,12 @@ if (isFormSent()) {
 	SQL_FREERESULT($result);
 
 	// Prepare it
-	if ($content['html'] == 'Y') {
-		$content['html_y'] = ' checked="checked"';
-		$content['html_n'] = '');
-	} else {
-		$content['html_n'] = ' checked="checked"';
-		$content['html_y'] = '';
-	}
+	$content['html_y'] = '';
+	$content['html_n'] = '';
+	$content['html_' . strtolower($content['html'])] = ' checked="checked"';
 
 	// Load main template
-	LOAD_TEMPLATE('member_html_mail_settings');
+	loadTemplate('member_html_mail_settings');
 }
 
 // [EOF]