X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=99a9eb1c8feeeef7e380892a1d5fa469e6657d49;hb=5feba25313d1ef15f35ef29c6b98ae7bc496afa5;hp=de748d4b1d2d95d37f59f0fa66db8aac1cbd458c;hpb=debaac55fafff501de5077f3672623c0d738a5b2;p=mailer.git

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index de748d4b1d..99a9eb1c8f 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,15 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Verwalten von HTML- oder Text-Newslettern        *
  * -------------------------------------------------------------------- *
- * $Revision:: 856                                                    $ *
- * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009)             $ *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author:: stelzi                                                   $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
+ * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2013 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 *
@@ -37,62 +36,68 @@
  ************************************************************************/
 
 // 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", __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
-if (IS_FORM_SENT()) {
-	$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_NUMROWS($result) > 0) {
+if (isFormSent()) {
+	$result = sqlQuery("SELECT
+	`userid`,
+	`email`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`status`='CONFIRMED' AND
+	`nl_receive`='Y'
+ORDER BY
+	`userid` ASC", __FILE__, __LINE__);
+	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";
+			$template = 'newsletter';
 
 			// Check for extension and sending-mode
-			if (!EXT_IS_ACTIVE("html_mail", true) && (REQUEST_POST('mode') == "html")) {
+			if (!isExtensionActive('html_mail', TRUE) && (postRequestElement('mail_mode') == 'html')) {
 				// Set mode to text mode
-				REQUEST_POST('mode') == "text";
-			} elseif (REQUEST_POST('mode') == "html") {
+				postRequestElement('mail_mode') == 'text';
+			} elseif (postRequestElement('mail_mode') == 'html') {
 				// Set HTML templates
-				$template = "newsletter_html";
+				$template = 'newsletter_html';
 			}
 
 			// Compile message
-			REQUEST_SET_POST('text', COMPILE_CODE(REQUEST_POST('text')));
+			setPostRequestElement('text', preCompileCode(postRequestElement('text')));
 
 			// Load template
-			$msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $content['userid']);
+			$message = loadEmailTemplate($template, array('text' => postRequestElement('text')), $content['userid']);
 
 			// ... and send it away!
-			SEND_NEWSLETTER($content['email'], REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
-		}
-
-		// Free memory
-		SQL_FREERESULT($result);
+			sendNewsletter($content['email'], postRequestElement('subject'), $message, postRequestElement('mail_mode'));
+		} // END - while
 
 		// Output message
-		LOAD_TEMPLATE("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
-	// @TODO Rewrite this constant
-	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");
+		loadTemplate('admin_newsletter', FALSE, $content);
 	} else {
 		// Load template with only text mode
-		LOAD_TEMPLATE("admin_newsletter_nohtml");
+		loadTemplate('admin_newsletter_nohtml', FALSE, $content);
 	}
 }
 
-//
+// [EOF]
 ?>