X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-html_mail.php;h=3b9cb6fe3d00ea9d9247c9b4eed7169e3e85281b;hb=34db702d004b245e5528b0ba20c6de441f61820a;hp=0e19e054a65b8fbda7d1381a52cad448a13970e6;hpb=5298a98f56b4d62bf6a463d5b8a2b63fb0e453c2;p=mailer.git

diff --git a/inc/modules/member/what-html_mail.php b/inc/modules/member/what-html_mail.php
index 0e19e054a6..3b9cb6fe3d 100644
--- a/inc/modules/member/what-html_mail.php
+++ b/inc/modules/member/what-html_mail.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 04/25/2004 *
- * ================                             Last change: 04/29/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 04/25/2004 *
+ * ===================                          Last change: 04/29/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-html_mail.php                               *
@@ -17,7 +17,8 @@
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,40 +39,34 @@
 
 // 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 (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(postRequestParameter('html'), getMemberId()), __FILE__, __LINE__);
+	loadTemplate('admin_settings_saved', false, '{--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);
+	// 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]
 ?>