X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=e7b2ca81336527f20f6f05b45703e9d77223d429;hb=22f132c8d6314f76c69dff58ec0dac21f5ca3bf2;hp=35b7e5eba6f3ce7bb76fd40694bff68f8380d9ad;hpb=660bf694d3714cb69ac67e7a62b345f93c8a119e;p=mailer.git

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 35b7e5eba6..e7b2ca8133 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/28/2003 *
- * ===============                              Last change: 03/04/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 09/28/2003 *
+ * ===================                          Last change: 03/04/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-send_newsletter.php                         *
@@ -10,9 +10,15 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verwalten von HTML- oder Text-Newslettern        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,69 +38,66 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+addMenuDescription('admin', __FILE__);
 
-if (isset($_POST['ok']))
-{
-	$result = SQL_QUERY("SELECT userid, email FROM "._MYSQL_PREFIX."_user_data WHERE status='CONFIRMED' AND nl_receive='Y' ORDER BY userid", __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) > 0)
-	{
+if (isFormSent()) {
+	$result = SQL_QUERY("SELECT
+	`userid`, `email`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`status`='CONFIRMED' AND `nl_receive`='Y'
+ORDER BY
+	`userid` ASC", __FILE__, __LINE__);
+	if (!SQL_HASZERONUMS($result)) {
 		// Members are available so we can send out the newsletter!
-		while (list($id, $email) = SQL_FETCHROW($result))
-		{
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Construct mail...
-			$template = "newsletter";
+			$template = 'newsletter';
 
 			// Check for extension and sending-mode
-			if (!EXT_IS_ACTIVE("html_mail", true) && ($_POST['mode'] == "html"))
-			{
+			if (!isExtensionActive('html_mail', true) && (postRequestParameter('mode') == 'html')) {
 				// Set mode to text mode
-				$_POST['mode'] == "text";
-			}
-			 elseif ($_POST['mode'] == "html")
-			{
+				postRequestParameter('mode') == 'text';
+			} elseif (postRequestParameter('mode') == 'html') {
 				// Set HTML templates
-				$template = "newsletter_html";
+				$template = 'newsletter_html';
 			}
 
 			// Compile message
-			$_POST['text'] = COMPILE_CODE($_POST['text']);
+			setPostRequestParameter('text', preCompileCode(postRequestParameter('text')));
 
 			// Load template
-			$msg = LOAD_EMAIL_TEMPLATE($template, $_POST['text'], $id);
+			$message = loadEmailTemplate($template, array('text' => postRequestParameter('text')), $content['userid']);
 
 			// ... and send it away!
-			SEND_NEWSLETTER($email, $_POST['subject'], $msg, $_POST['mode']);
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
+			sendNewsletter($content['email'], postRequestParameter('subject'), $message, postRequestParameter('mode'));
+		} // END - while
 
 		// Output message
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NL_SEND_DONE);
-	}
-}
- else
-{
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_NL_SEND_DONE--}');
+	} // END - if
+
+	// Free memory
+	SQL_FREERESULT($result);
+} else {
 	// Copy data into constants for the template and load it
-	define('_DATESTAMP', MAKE_DATETIME(time(), "3"));
-	if (EXT_IS_ACTIVE("html_mail"))
-	{
+	$content['datestamp'] = generateDateTime(time(), 3);
+
+	// Extension html_mail installed?
+	if (isExtensionActive('html_mail')) {
 		// Load template with HTML mode
-		LOAD_TEMPLATE("admin_newsletter");
-	}
-	 else
-	{
+		loadTemplate('admin_newsletter', false, $content);
+	} else {
 		// Load template with only text mode
-		LOAD_TEMPLATE("admin_newsletter_nohtml");
+		loadTemplate('admin_newsletter_nohtml', false, $content);
 	}
 }
 
-//
+// [EOF]
 ?>