X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=fdfe3c8bc03dff42e81d8e043acbb0304ed65ac0;hp=187d3c8a30a7c075b06b671cbcaee1e0585f9fc5;hb=fdfe034bd27d3d4eaf75dda77e76c8555177b076;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 187d3c8a30..fdfe3c8bc0 100644
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -39,29 +40,35 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
 	unsetPostRequestParameter('ok');
-}
+} // END - if
 
-$result = SQL_QUERY("SELECT id, sender, subject, payment_id, cat_id FROM `{?_MYSQL_PREFIX?}_pool` ORDER BY timestamp", __FILE__, __LINE__);
-if (SQL_NUMROWS($result) > 0) {
+// Query the pool
+$result = SQL_QUERY('SELECT
+	`id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+ORDER BY
+	`timestamp` ASC', __FILE__, __LINE__);
+
+// Entries found?
+if (!SQL_HASZERONUMS($result)) {
 	if (isFormSent()) {
 		// Make mail editable...
-		$result = SQL_QUERY_ESC("SELECT subject, text, url FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
-		array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
-		list($subj, $text, $url) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$result = SQL_QUERY_ESC("SELECT `id`, `sender` AS `userid`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+			array(bigintval(postRequestParameter('id'))), __FILE__, __LINE__);
 
-		// Prepare constant for template
-		$content['id']       = bigintval(postRequestParameter('id'));
-		$content['url']      = $url;
-		$content['subject']  = $subj;
-		$content['text']     = $text;
+		// Fetch row
+		$content = SQL_FETCHARRAY($result);
+
+		// Free result
+		SQL_FREERESULT($result);
 
 		// Load template
 		loadTemplate('admin_edit_email', false, $content);
@@ -83,32 +90,21 @@ LIMIT 1",
 				bigintval(postRequestParameter('id')),
 			), __FILE__, __LINE__);
 
-		if (SQL_AFFECTEDROWS() == 1) {
-			$content = getMessage('SETTINGS_SAVED');
+		if (!SQL_HASZEROAFFECTED()) {
+			$content = '{--SETTINGS_SAVED--}';
 		} else {
-			$content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
+			$content = '<span class="notice">{--SETTINGS_NOT_SAVED--}</span>';
 		}
 
 		// Display message
 		loadTemplate('admin_settings_saved', false, $content);
 	} else {
 		// There are mail orders available
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
-			// Prepare data for the row template
-			$content = array(
-				'sw'      => $SW,
-				'id'      => $content['id'],
-				'subject' => $content['subject'],
-				'userid'  => generateUserProfileLink($content['sender']),
-				'pay'     => getPaymentTitlePrice($content['payment_id']),
-				'cat'     => getCategory($content['cat_id']),
-			);
-
 			// Load row template and switch colors
 			$OUT .= loadTemplate('admin_edit_email_row', true, $content);
-			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
@@ -118,7 +114,7 @@ LIMIT 1",
 	}
 } else {
 	// No mail orders left in pool
-	loadTemplate('admin_settings_saved', false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
+	loadTemplate('admin_settings_saved', false, '<span class="notice">{--ADMIN_NO_MAILS_IN_POOL--}</span>');
 }
 
 // [EOF]