X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=1928e664ad6094e149f46ac4aac4cfd0ba3046bd;hb=4f7df133f736da124e6f7bd02008b9093f736451;hp=d964131028492fafa03e58699543b1470679f7d4;hpb=db0c6702086eea2c44d0aae1702dc2e77a0afc4e;p=mailer.git diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php index d964131028..1928e664ad 100644 --- 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 - 2012 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 * @@ -45,11 +45,13 @@ addYouAreHereLink('admin', __FILE__); if (isFormSent()) { $result = SQL_QUERY("SELECT - `userid`, `email` + `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)) { @@ -59,22 +61,22 @@ ORDER BY $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 @@ -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); } }