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

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index d94191ef98..8225f6e1c4 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -44,22 +44,24 @@ 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) && (postRequestElement('mail_mode') == 'html')) {
+			if (!isExtensionActive('html_mail', TRUE) && (postRequestElement('mail_mode') == 'html')) {
 				// Set mode to text mode
 				postRequestElement('mail_mode') == 'text';
 			} elseif (postRequestElement('mail_mode') == 'html') {
@@ -82,7 +84,7 @@ ORDER BY
 	} // 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);
 	}
 }