New function isValidUserid() introduced, more rewrites to EL:

[mailer.git] / inc / modules / admin / what-edit_emails.php

diff --git a/inc/modules/admin/what-edit_emails.php b/inc/modules/admin/what-edit_emails.php
index 29bb65f1a2761c0de84aa5f0ec1741ead9f5d027..b18689ddeb299f100beab2e46d3234afbd41359d 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -49,20 +49,26 @@ 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__);
+// Query the pool
+$result = SQL_QUERY("SELECT
+       `id`, `sender`, `subject`, `payment_id`, `cat_id`
+FROM
+       `{?_MYSQL_PREFIX?}_pool`
+ORDER BY
+       `timestamp` ASC", __FILE__, __LINE__);
+
+// Entries found?
 if (SQL_NUMROWS($result) > 0) {
        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);
@@ -96,20 +102,13 @@ LIMIT 1",
                // There are mail orders available
                $OUT = ''; $SW = 2;
                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']),
-                       );
+                       // Add color swapping
+                       $content['sw'] = $SW;
 
                        // Load row template and switch colors
                        $OUT .= loadTemplate('admin_edit_email_row', true, $content);
                        $SW = 3 - $SW;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);