X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-newsletter.php;h=aa3d6f531a242103fee6410977ea4d0be2f43d2e;hb=996586caead345147b60216d2f4325b5f57a9874;hp=cfb079145b69bd84f5587688e9a43a6ec099db7e;hpb=d1637dad0b2ca0e5fb411ee0843f01bfb4cc94e0;p=mailer.git

diff --git a/inc/modules/member/what-newsletter.php b/inc/modules/member/what-newsletter.php
index cfb079145b..aa3d6f531a 100644
--- a/inc/modules/member/what-newsletter.php
+++ b/inc/modules/member/what-newsletter.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,72 +38,18 @@
 
 // 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('newsletter')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('newsletter'));
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
-
-// Load status
-$result = SQL_QUERY_ESC("SELECT `nl_receive`, `nl_until`, `nl_timespan` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s LIMIT 1",
-	array(getUserId()), __FILE__, __LINE__);
-list($status, $until, $span) = SQL_FETCHROW($result);
-SQL_FREERESULT($result);
-
-// Remember charge value
-define('__CHARGE_VALUE', translateComma(getConfig('nl_charge')));
-
-if ((isFormSent()) && ($status == 'Y') && ($span == '0')) {
-	// Save request
-	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_timespan='".(getConfig('one_day') * 30)."' WHERE userid=%s LIMIT 1",
-		array(getUserId()), __FILE__, __LINE__);
-
-	// Load admin message
-	$admin_msg = LOAD_EMAIL_TEMPLATE('admin_newsletter_request', array(), getUserId());
-
-	// Add task
-	createNewTask('{--ADMIN_NL_SUBJECT--}', $admin_msg, 'NL_UNSUBSCRIBE', getUserId());
-
-	// Send mail to member
-	$message = LOAD_EMAIL_TEMPLATE('member_newsletter_request', array(), getUserId());
-	sendEmail(getUserId(), getMessage('NL_MEMBER_SUBJECT'), $message);
+addMenuDescription('member', __FILE__);
 
-	// Send mail to all admins
-	sendAdminNotification(getMessage('NL_ADMIN_SUBJECT'), 'admin_newsletter_request', array(), getUserId());
-
-	// Display message
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_DONE'));
-} elseif ($span > 0) {
-	// Already ordered
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('NL_MEMBER_REQUEST_ALREADY'));
-} else {
-	// Load template for the note
-	define('NL_MEMBER_NOTE', LOAD_TEMPLATE('member_newsletter_note', true));
-
-	// Set status message and submit button
-	switch ($status) {
-		case 'Y': // Receives the newsletter
-			define('__STATUS_VALUE', getMessage('NL_MEMBER_ON'));
-			define('__UNTIL_VALUE' , '');
-			define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_OFF'));
-			break;
-
-		case 'N': // Does not receive the newsletter
-			define('__STATUS_VALUE', getMessage('NL_MEMBER_OFF'));
-			define('__UNTIL_VALUE' , generateDateTime($until, '2'));
-			define('NL_SUBMIT'     , getMessage('NL_MEMBER_SUBMIT_ON'));
-			break;
-	} // END - switch
-
-	// Load template and member settings
-	LOAD_TEMPLATE('member_newsletter');
-}
+if ((!isExtensionActive('newsletter')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('newsletter'));
+	return;
+} // END - if
 
 // [EOF]
 ?>