X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmonthly%2Fmonthly_newsletter.php;h=19172f1df14b39a91a6e14c621ad804b37916a9c;hb=89c00e43d2ce1dd1afe11c2c8485307342805f97;hp=1afaf04c616755620faf3d42db60b6d859db5980;hpb=19cd0d37b2bcbf9dd4f3c38a9cecd7f5011d6b66;p=mailer.git

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 1afaf04c61..19172f1df1 100644
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -32,52 +32,40 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
 	$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");
+} elseif (!EXT_IS_ACTIVE("newsletter")) {
 	return;
 }
 
 // Do not execute when script is in CSS mode or no daily reset
 if (($CSS == 1) || (!defined('__DAILY_RESET'))) return;
+//* DEBUG: */ echo basename(__FILE__)."<br />\n";
 
 // Get current month (2 digits)
 $curr = date("m", time());
 
-if ($_CONFIG['nl_month'] != $curr)
-{
+if (getConfig('last_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)
-	{
+	$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))
-		{
+		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__);
+			SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET nl_receive='Y', nl_until='0' WHERE userid=%s 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
-			SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_reset", "", $GLOBALS['userid']);
+			SEND_ADMIN_NOTIFICATION(NL_ADMIN_SUBJECT, "admin_newsletter_reset", array(), $GLOBALS['userid']);
 		}
 
 		// 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
 	}
 }