X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_newsletter.php;h=e4d6d79410ad6e20e7691394bd284c60526de5b7;hb=6f440d8172c3dd7ef3ac406747fb2a2264e7f620;hp=0ada8ed09feced1157a76f38ef9c76cda4bd8bc2;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 0ada8ed09f..e4d6d79410 100644
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Monatlicher Test auf Newsletter-Abmeldungen      *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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                           *
+ * 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 *
@@ -32,62 +37,15 @@
  ************************************************************************/
 
 // 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 (!isExtensionActive('newsletter')) {
 	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__);
-
-			// 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
-	}
-}
+if ((getOutputMode() == 1) || (!isResetModeEnabled())) return;
+//* DEBUG: */ outputHtml(basename(__FILE__)."<br />");
 
-//
+// [EOF]
 ?>