X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-edit_emails.php;h=794fd2de8f0c67fa19d1e8dec61a59a4a2e1214a;hb=27272fdaa3ad8895e6b55ec77658ad5c1f80e89c;hp=7a730e3d1a210f88245982c75e110a525a8c2ceb;hpb=0a69b4e17157eda9b6e1c70ff494292ccf8cbbd0;p=mailer.git

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 7a730e3d1a..794fd2de8f 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 *
@@ -46,22 +47,28 @@ addMenuDescription('admin', __FILE__);
 
 if ((isFormSent()) && (!isPostRequestParameterSet('id'))) {
 	unsetPostRequestParameter('ok');
-}
+} // END - if
+
+// Query the pool
+$result = SQL_QUERY('SELECT
+	`id`, `sender`, `subject`, `payment_id`, `cat_id`
+FROM
+	`{?_MYSQL_PREFIX?}_pool`
+ORDER BY
+	`timestamp` ASC', __FILE__, __LINE__);
 
-$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) {
+// 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`, `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);
@@ -84,7 +91,7 @@ LIMIT 1",
 			), __FILE__, __LINE__);
 
 		if (SQL_AFFECTEDROWS() == 1) {
-			$content = getMessage('SETTINGS_SAVED');
+			$content = '{--SETTINGS_SAVED--}';
 		} else {
 			$content = '<span class="admin_failed">{--SETTINGS_NOT_SAVED--}</span>';
 		}
@@ -93,22 +100,11 @@ LIMIT 1",
 		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);