X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=d964131028492fafa03e58699543b1470679f7d4;hb=8f37a3b2708cfc4b4ef266f4be813a84511daa8f;hp=5458ff6e5ff4bf6c072297717785513602f61e68;hpb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;p=mailer.git

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 5458ff6e5f..d964131028 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -14,11 +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, 2010 by Mailer Developer Team                    *
+ * 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 *
@@ -43,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
@@ -54,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...
@@ -80,7 +78,7 @@ ORDER BY
 		} // END - while
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}');
+		displayMessage('{--ADMIN_NL_SEND_DONE--}');
 	} // END - if
 
 	// Free memory
@@ -88,6 +86,8 @@ ORDER BY
 } 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);