X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=cf3f96306623e929835a2c1d4507b65810decb8e;hb=9e604ce404fe7d2d8dafc259a5fb8cd826aec5e6;hp=285fc0f0592fae93d72367f5ccd3090008bf5bdd;hpb=a090e351c49fe021fb3064325694da03402332e0;p=mailer.git

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 285fc0f059..cf3f963066 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -38,18 +38,22 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
 ADD_DESCR('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 (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_NUMROWS($result) > 0) {
 		// Members are available so we can send out the newsletter!
 		while ($content = SQL_FETCHARRAY($result)) {
@@ -59,20 +63,20 @@ ORDER BY userid ASC", __FILE__, __LINE__);
 			// Check for extension and sending-mode
 			if (!EXT_IS_ACTIVE('html_mail', true) && (REQUEST_POST('mode') == 'html')) {
 				// Set mode to text mode
-				REQUEST_POST('mode') == "text";
+				REQUEST_POST('mode') == 'text';
 			} elseif (REQUEST_POST('mode') == 'html') {
 				// Set HTML templates
-				$template = "newsletter_html";
+				$template = 'newsletter_html';
 			}
 
 			// Compile message
 			REQUEST_SET_POST('text', COMPILE_CODE(REQUEST_POST('text')));
 
 			// Load template
-			$msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $content['userid']);
+			$message = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $content['userid']);
 
 			// ... and send it away!
-			SEND_NEWSLETTER($content['email'], REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
+			SEND_NEWSLETTER($content['email'], REQUEST_POST('subject'), $message, REQUEST_POST('mode'));
 		}
 
 		// Free memory
@@ -84,13 +88,13 @@ ORDER BY userid ASC", __FILE__, __LINE__);
 } else {
 	// Copy data into constants for the template and load it
 	// @TODO Rewrite this constant
-	define('_DATESTAMP', MAKE_DATETIME(time(), "3"));
+	define('_DATESTAMP', generateDateTime(time(), '3'));
 	if (EXT_IS_ACTIVE('html_mail')) {
 		// Load template with HTML mode
-		LOAD_TEMPLATE("admin_newsletter");
+		LOAD_TEMPLATE('admin_newsletter');
 	} else {
 		// Load template with only text mode
-		LOAD_TEMPLATE("admin_newsletter_nohtml");
+		LOAD_TEMPLATE('admin_newsletter_nohtml');
 	}
 }