X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=8225f6e1c4fcef5d7ef17bc2a75f1d5f12ddfd66;hp=6711aa3ede20c678cc0a41d46ddead231ccb4938;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 6711aa3ede..8225f6e1c4 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -14,11 +14,10 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * 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 *
@@ -42,57 +41,61 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+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_NUMROWS($result) > 0) {
+	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', compileCode(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'));
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
+			sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mail_mode'));
+		} // END - while
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
-	}
+		displayMessage('{--ADMIN_NL_SEND_DONE--}');
+	} // END - if
+
+	// Free memory
+	sqlFreeResult($result);
 } else {
 	// Copy data into constants for the template and load it
 	$content['datestamp'] = generateDateTime(time(), 3);
+
+	// 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);
 	}
 }