X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-html_mail.php;h=278e8b865ba67154420e79bbe51d9af6edce427b;hp=7baa959b92f67b456fb42378366b90489212a49c;hb=9f6c30cc0e06098171d773d671292081ecee3d29;hpb=81bfbcd72e424060ea1223b49ad92fcfa150f361

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 7baa959b92..278e8b865b 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,40 +38,40 @@
 
 // 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__, sprintf(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'), 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",
-		array(getUserId()), __FILE__, __LINE__);
-	list($mode) = SQL_FETCHROW($result);
-	SQL_FREERESULT($result);
+	if (!fetchUserData(getUserId())) {
+		// Something really bad happened
+		debug_report_bug('No user account ' . getUserId() . ' found.');
+	} // END - if
+
+	// Prepare it
+	$content['html_y'] = '';
+	$content['html_n'] = '';
+	$content['html_' . strtolower(getUserData('html'))] = ' checked="checked"';
 
-	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");
+	// Load main template
+	loadTemplate('member_html_mail_settings', false, $content);
 }
 
-//
+// [EOF]
 ?>