Complete rewrite of and , wrapper functions added, see bug #101

[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 68091e0907705bddfae84740f3e9a429a7b4a58d..98f17236698cf97f61604f1310d12c7f52789287 100644 (file)
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -40,10 +40,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok'])) {
+if (IS_FORM_SENT()) {
        $result = SQL_QUERY("SELECT userid, email
-FROM `"._MYSQL_PREFIX."_user_data`
-WHERE status='CONFIRMED' AND nl_receive='Y'
+FROM `{!_MYSQL_PREFIX!}_user_data`
+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!
@@ -52,29 +52,29 @@ ORDER BY userid ASC", __FILE__, __LINE__);
                        $template = "newsletter";
 
                        // Check for extension and sending-mode
-                       if (!EXT_IS_ACTIVE("html_mail", true) && ($_POST['mode'] == "html")) {
+                       if (!EXT_IS_ACTIVE("html_mail", true) && (REQUEST_POST('mode') == "html")) {
                                // Set mode to text mode
-                               $_POST['mode'] == "text";
-                       } elseif ($_POST['mode'] == "html") {
+                               REQUEST_POST('mode') == "text";
+                       } elseif (REQUEST_POST('mode') == "html") {
                                // Set HTML templates
                                $template = "newsletter_html";
                        }
 
                        // Compile message
-                       $_POST['text'] = COMPILE_CODE($_POST['text']);
+                       REQUEST_SET_POST('text', COMPILE_CODE(REQUEST_POST('text')));
 
                        // Load template
-                       $msg = LOAD_EMAIL_TEMPLATE($template, array('text' => $_POST['text']), $id);
+                       $msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $id);
 
                        // ... and send it away!
-                       SEND_NEWSLETTER($email, $_POST['subject'], $msg, $_POST['mode']);
+                       SEND_NEWSLETTER($email, REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
                }
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Output message
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NL_SEND_DONE);
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NL_SEND_DONE'));
        }
 } else {
        // Copy data into constants for the template and load it