Fix for missing array element 'userid', see ticket #205, thanks to piter01

[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 f90c9c1e3b90d791191c2ccabe6bdfe4a9d597c8..fdfe3c8bc03dff42e81d8e043acbb0304ed65ac0 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -40,28 +40,28 @@
 // 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
 
 // Query the pool
-$result = SQL_QUERY("SELECT
-       `id`, `sender`, `subject`, `payment_id`, `cat_id`
+$result = SQL_QUERY('SELECT
+       `id`, `sender` AS `userid`, `subject`, `payment_id`, `cat_id`
 FROM
        `{?_MYSQL_PREFIX?}_pool`
 ORDER BY
-       `timestamp` ASC", __FILE__, __LINE__);
+       `timestamp` ASC', __FILE__, __LINE__);
 
 // Entries found?
-if (SQL_NUMROWS($result) > 0) {
+if (!SQL_HASZERONUMS($result)) {
        if (isFormSent()) {
                // Make mail editable...
-               $result = SQL_QUERY_ESC("SELECT `id`, `subject`, `text`, `url` FROM `{?_MYSQL_PREFIX?}_pool` WHERE `id`=%s LIMIT 1",
+               $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__);
 
                // Fetch row
@@ -90,24 +90,20 @@ LIMIT 1",
                                bigintval(postRequestParameter('id')),
                        ), __FILE__, __LINE__);
 
-               if (SQL_AFFECTEDROWS() == 1) {
+               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)) {
-                       // 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
@@ -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]