Obsolete action=login removed from URLs

[mailer.git] / inc / modules / admin / what-send_newsletter.php

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 98f17236698cf97f61604f1310d12c7f52789287..2113d74fa86d552d80e62fe39570da8cd1b18274 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -47,7 +47,7 @@ WHERE `status`='CONFIRMED' AND nl_receive='Y'
 ORDER BY userid ASC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Members are available so we can send out the newsletter!
-               while (list($id, $email) = SQL_FETCHROW($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Construct mail...
                        $template = "newsletter";
 
@@ -64,10 +64,10 @@ ORDER BY userid ASC", __FILE__, __LINE__);
                        REQUEST_SET_POST('text', COMPILE_CODE(REQUEST_POST('text')));
 
                        // Load template
-                       $msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $id);
+                       $msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $content['userid']);
 
                        // ... and send it away!
-                       SEND_NEWSLETTER($email, REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
+                       SEND_NEWSLETTER($content['email'], REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
                }
 
                // Free memory
@@ -78,6 +78,7 @@ ORDER BY userid ASC", __FILE__, __LINE__);
        }
 } else {
        // Copy data into constants for the template and load it
+       // @TODO Rewrite this constant
        define('_DATESTAMP', MAKE_DATETIME(time(), "3"));
        if (EXT_IS_ACTIVE("html_mail")) {
                // Load template with HTML mode