X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-send_newsletter.php;h=9cdac1d2a6aa64e1e4a722dff3662ba7e47bee51;hb=98077af43126dd7c274fe57f6ea0494e906e8943;hp=9a4377833fc953976f36a94e5fdb466153539182;hpb=5dfaf0ed80b30f53574a8866858d3e7cf05ce325;p=mailer.git

diff --git a/inc/modules/admin/what-send_newsletter.php b/inc/modules/admin/what-send_newsletter.php
index 9a4377833f..9cdac1d2a6 100644
--- a/inc/modules/admin/what-send_newsletter.php
+++ b/inc/modules/admin/what-send_newsletter.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * 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                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,70 +37,62 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR('admin', __FILE__);
 
-OPEN_TABLE("100%", "admin_content admin_content_align", "");
-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_NUMROWS($result) > 0) {
 		// 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 (!EXT_IS_ACTIVE('html_mail', true) && (REQUEST_POST('mode') == 'html')) {
 				// Set mode to text mode
-				$_POST['mode'] == "text";
-			}
-			 elseif ($_POST['mode'] == "html")
-			{
+				REQUEST_POST('mode') == "text";
+			} elseif (REQUEST_POST('mode') == 'html') {
 				// Set HTML templates
 				$template = "newsletter_html";
 			}
 
 			// Compile message
-			$_POST['text'] = COMPILE_CODE($_POST['text']);
+			REQUEST_SET_POST('text', COMPILE_CODE(REQUEST_POST('text')));
 
 			// Load template
-			$msg = LOAD_EMAIL_TEMPLATE($template, $_POST['text'], $id);
+			$msg = LOAD_EMAIL_TEMPLATE($template, array('text' => REQUEST_POST('text')), $content['userid']);
 
 			// ... and send it away!
-			SEND_NEWSLETTER($email, $_POST['subject'], $msg, $_POST['mode']);
+			SEND_NEWSLETTER($content['email'], REQUEST_POST('subject'), $msg, REQUEST_POST('mode'));
 		}
 
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Output message
-		LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_NL_SEND_DONE);
+		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NL_SEND_DONE'));
 	}
-}
- else
-{
+} else {
 	// Copy data into constants for the template and load it
-	define('_DATESTAMP', MAKE_DATETIME(time(), "3"));
-	if (EXT_IS_ACTIVE("html_mail"))
-	{
+	// @TODO Rewrite this constant
+	define('_DATESTAMP', generateDateTime(time(), '3'));
+	if (EXT_IS_ACTIVE('html_mail')) {
 		// Load template with HTML mode
 		LOAD_TEMPLATE("admin_newsletter");
-	}
-	 else
-	{
+	} else {
 		// Load template with only text mode
 		LOAD_TEMPLATE("admin_newsletter_nohtml");
 	}
 }
-CLOSE_TABLE();
+
 //
 ?>