X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmonthly%2Fmonthly_newsletter.php;h=b71659c451c4637292e1c811b74b7ce9880a1275;hb=ea295a391646261bc643264570404f6862abcbd4;hp=fdbfd590545ccf3b992c60a92b098ef183271301;hpb=52e8a0635bd0b7c653845685c55e4e5f251375fe;p=mailer.git

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index fdbfd59054..b71659c451 100644
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -32,57 +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
-			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);
-			}
+			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
 	}
 }