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

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 6711aa3ede..d964131028 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -14,10 +14,9 @@
  * $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                           *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -42,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isFormSent()) {
 	$result = SQL_QUERY("SELECT
@@ -53,7 +52,7 @@ WHERE
 	`status`='CONFIRMED' AND `nl_receive`='Y'
 ORDER BY
 	`userid` ASC", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// Members are available so we can send out the newsletter!
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Construct mail...
@@ -69,24 +68,26 @@ ORDER BY
 			}
 
 			// Compile message
-			setPostRequestParameter('text', compileCode(postRequestParameter('text')));
+			setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
 
 			// Load template
 			$message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
 
 			// ... and send it away!
 			sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
+		} // END - while
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
-	}
+		displayMessage('{--ADMIN_NL_SEND_DONE--}');
+	} // END - if
+
+	// Free memory
+	SQL_FREERESULT($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);