More rewrites to make use of (cached) wrapper functions

[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 cbafde7b701b6df41167397b46757c19498e8ef5..2d9eaef8a6849a218017568102a7574902b902ab 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 03/04/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 03/04/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-send_newsletter.php                         *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -53,37 +54,37 @@ WHERE
        `status`='CONFIRMED' AND `nl_receive`='Y'
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Members are available so we can send out the newsletter!
                while ($content = SQL_FETCHARRAY($result)) {
                        // Construct mail...
                        $template = 'newsletter';
 
                        // Check for extension and sending-mode
-                       if (!isExtensionActive('html_mail', true) && (postRequestElement('mode') == 'html')) {
+                       if (!isExtensionActive('html_mail', true) && (postRequestParameter('mode') == 'html')) {
                                // Set mode to text mode
-                               postRequestElement('mode') == 'text';
-                       } elseif (postRequestElement('mode') == 'html') {
+                               postRequestParameter('mode') == 'text';
+                       } elseif (postRequestParameter('mode') == 'html') {
                                // Set HTML templates
                                $template = 'newsletter_html';
                        }
 
                        // Compile message
-                       setRequestPostElement('text', compileCode(postRequestElement('text')));
+                       setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
 
                        // Load template
-                       $message = loadEmailTemplate($template, array('text' => postRequestElement('text')), $content['userid']);
+                       $message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
 
                        // ... and send it away!
-                       sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mode'));
-               }
-
-               // Free memory
-               SQL_FREERESULT($result);
+                       sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
+               } // END - while
 
                // Output message
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
-       }
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}');
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result);
 } else {
        // Copy data into constants for the template and load it
        $content['datestamp'] = generateDateTime(time(), 3);