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

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index fdbfd59054..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                           *
@@ -10,10 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatlicher Test auf Newsletter-Abmeldungen      *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
- * 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 *
@@ -32,59 +36,21 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
- elseif ((!EXT_IS_ACTIVE("newsletter")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "newsletter");
+if (!defined('__SECURITY')) {
+	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 (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
-
-// Get current month (2 digits)
-$curr = date("m", time());
-
-if ($_CONFIG['nl_month'] != $curr)
-{
-	// Check for unsubscribed members
-	$result = SQL_QUERY("SELECT userid, 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(list($uid, $until) = SQL_FETCHROW($result))
-		{
-			// Update account
-			$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET nl_receive='Y', nl_until='0' WHERE userid=%d LIMIT 1",
-			 array(bigintval($uid)), __FILE__, __LINE__);
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset started.');
 
-			// Send email to him
-			$msg = LOAD_EMAIL_TEMPLATE("member_newsletter_reset", true, bigintval($uid));
-			SEND_EMAIL($uid, NL_MEMBER_RESET_SUBJECT, $msg);
-
-			// Send email to admin
-			if (GET_EXT_VERSION("admins") >= "0.4.1") {
-				SEND_ADMIN_EMAILS_PRO(NL_ADMIN_SUBJECT, "admin_newsletter_reset", "", $GLOBALS['userid']);
-			} else {
-				$msg = LOAD_EMAIL_TEMPLATE("admin_newsletter_reset", true, bigintval($uid));
-				SEND_ADMIN_EMAILS(NL_ADMIN_SUBJECT, $msg);
-			}
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
-
-		// Update last month
-		$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET nl_month='%s' WHERE config=0 LIMIT 1",
-		 array($curr), __FILE__, __LINE__);
-
-		// Destroy cache
-	}
-}
+// Debug line
+//* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Monthly reset ended.');
 
-//
+// [EOF]
 ?>