A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[mailer.git] / inc / monthly / monthly_newsletter.php

diff --git a/inc/monthly/monthly_newsletter.php b/inc/monthly/monthly_newsletter.php
index 235bbdf8a0f1196c811953795a1455279682e7bc..9e7dbfe7effa58c39db9a78093ce4bdf94330ad7 100644 (file)
--- a/inc/monthly/monthly_newsletter.php
+++ b/inc/monthly/monthly_newsletter.php
@@ -48,21 +48,21 @@ $curr = date("m", time());
 
 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__);
+       $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 (list($uid, $until) = SQL_FETCHROW($result)) {
+               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($uid)), __FILE__, __LINE__);
+                               array(bigintval($content['userid'])), __FILE__, __LINE__);
 
                        // Send email to him
-                       $msg = LOAD_EMAIL_TEMPLATE("member_newsletter_reset", true, bigintval($uid));
-                       SEND_EMAIL($uid, NL_MEMBER_RESET_SUBJECT, $msg);
+                       $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(NL_ADMIN_SUBJECT, "admin_newsletter_reset", array(), $GLOBALS['userid']);
-               }
+                       SEND_ADMIN_NOTIFICATION(getMessage('NL_ADMIN_SUBJECT'), "admin_newsletter_reset", array(), $GLOBALS['userid']);
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result);