Added update_year.sh (still not fully flexible) and updated all years with it.

[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 39cfa49be6ca5bb5be887f3090904ac7d186af2d..8225f6e1c4fcef5d7ef17bc2a75f1d5f12ddfd66 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,45 +44,47 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
-       $result = SQL_QUERY("SELECT
-       `userid`, `email`
+       $result = sqlQuery("SELECT
+       `userid`,
+       `email`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
-       `status`='CONFIRMED' AND `nl_receive`='Y'
+       `status`='CONFIRMED' AND
+       `nl_receive`='Y'
 ORDER BY
        `userid` ASC", __FILE__, __LINE__);
-       if (!SQL_HASZERONUMS($result)) {
+       if (!ifSqlHasZeroNums($result)) {
                // Members are available so we can send out the newsletter!
-               while ($content = SQL_FETCHARRAY($result)) {
+               while ($content = sqlFetchArray($result)) {
                        // Construct mail...
                        $template = 'newsletter';
 
                        // Check for extension and sending-mode
-                       if (!isExtensionActive('html_mail', true) && (postRequestParameter('mode') == 'html')) {
+                       if (!isExtensionActive('html_mail', TRUE) && (postRequestElement('mail_mode') == 'html')) {
                                // Set mode to text mode
-                               postRequestParameter('mode') == 'text';
-                       } elseif (postRequestParameter('mode') == 'html') {
+                               postRequestElement('mail_mode') == 'text';
+                       } elseif (postRequestElement('mail_mode') == 'html') {
                                // Set HTML templates
                                $template = 'newsletter_html';
                        }
 
                        // Compile message
-                       setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
+                       setPostRequestElement('text', preCompileCode(postRequestElement('text')));
 
                        // Load template
-                       $message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
+                       $message = loadEmailTemplate($template, array('text' => postRequestElement('text')), $content['userid']);
 
                        // ... and send it away!
-                       sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
+                       sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mail_mode'));
                } // END - while
 
                // Output message
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}');
+               displayMessage('{--ADMIN_NL_SEND_DONE--}');
        } // END - if
 
        // Free memory
-       SQL_FREERESULT($result);
+       sqlFreeResult($result);
 } else {
        // Copy data into constants for the template and load it
        $content['datestamp'] = generateDateTime(time(), 3);
@@ -90,10 +92,10 @@ ORDER BY
        // Extension html_mail installed?
        if (isExtensionActive('html_mail')) {
                // Load template with HTML mode
-               loadTemplate('admin_newsletter', false, $content);
+               loadTemplate('admin_newsletter', FALSE, $content);
        } else {
                // Load template with only text mode
-               loadTemplate('admin_newsletter_nohtml', false, $content);
+               loadTemplate('admin_newsletter_nohtml', FALSE, $content);
        }
 }