X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_newsletter.php;h=b9332024a572330e1fd59eaabb710dafc6d5d5ce;hb=64eecfb13d8618ddcf0e9d53920a21b0401b3971;hp=a85faab0dc571a47c490e27b6de92ad0e6b9908c;hpb=e6785b4a4845d7a885b0e9c6dac517c6867940e1;p=mailer.git

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index a85faab0dc..b9332024a5 100644
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 03/04/2005 *
- * ===============                              Last change: 03/04/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 03/04/2005 *
+ * ===================                          Last change: 06/20/2010 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : monthly_newsletter.php                           *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -38,41 +37,20 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!EXT_IS_ACTIVE('newsletter')) {
+	die();
+} elseif ((isCssOutputMode()) || (!isResetModeEnabled())) {
+	// Do not execute when script is in CSS mode or no hourly reset
+	return;
+} elseif (!isExtensionActive('newsletter')) {
+	logDebugMessage(__FILE__, __LINE__, 'Not resetting, needed extension disabled.');
 	return;
 }
 
-// Do not execute when script is in CSS mode or no daily reset
-if (($GLOBALS['output_mode'] == 1) || (!isResetModeEnabled())) return;
-//* DEBUG: */ echo basename(__FILE__)."<br />\n";
-
-// Get current month (2 digits)
-$curr = date("m", time());
-
-if (getConfig('last_month') != $curr) {
-	// Check for unsubscribed members
-	$result = SQL_QUERY("SELECT userid, email, nl_until FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nl_receive='N' ORDER BY userid", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
-		// Some unsubscriptions are found so we reset them to receive newsletters
-		while ($content = SQL_FETCHARRAY($result)) {
-			// Update account
-			SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET nl_receive='Y', nl_until='0' WHERE userid=%s LIMIT 1",
-				array(bigintval($content['userid'])), __FILE__, __LINE__);
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-			// Send email to him
-			$msg = LOAD_EMAIL_TEMPLATE("member_newsletter_reset", true, bigintval($content['userid']));
-			SEND_EMAIL($content['email'], getMessage('NL_MEMBER_RESET_SUBJECT'), $msg);
-
-			// Send email to admin
-			SEND_ADMIN_NOTIFICATION(getMessage('NL_ADMIN_SUBJECT'), "admin_newsletter_reset", array(), getUserId());
-		} // END - if
-
-		// Free memory
-		SQL_FREERESULT($result);
-	}
-}
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
 
-//
+// [EOF]
 ?>