A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

[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 c7e5c74de3f4844da816363a7c7a5e23174c08e8..350831451201e757e32367c7e1e641115941a654 100644 (file)
--- a/inc/modules/admin/what-edit_emails.php
+++ b/inc/modules/admin/what-edit_emails.php
@@ -52,6 +52,7 @@ if (SQL_NUMROWS($result) > 0) {
                 array(bigintval(REQUEST_POST('id'))), __FILE__, __LINE__);
                list($subj, $text, $url) = SQL_FETCHROW($result);
                SQL_FREERESULT($result);
+               // @TODO More constants to rewrite
                define('__ID_VALUE'  , REQUEST_POST('id'));
                define('__URL_VALUE' , $url);
                define('__SUBJ_VALUE', $subj);
@@ -74,7 +75,7 @@ WHERE id=%s LIMIT 1",
 ), __FILE__, __LINE__);
 
                if (SQL_AFFECTEDROWS() == 1) {
-                       $content = SETTINGS_SAVED;
+                       $content = getMessage('SETTINGS_SAVED');
                } else {
                        $content = "<span class=\"admin_failed\">{--SETTINGS_NOT_SAVED--}</span>";
                }
@@ -83,16 +84,17 @@ WHERE id=%s LIMIT 1",
                LOAD_TEMPLATE("admin_settings_saved", false, $content);
        } else {
                // There are mail orders available
-               $SW = 2; $OUT = "";
-               while (list($id, $sender, $subj, $pay, $cat) = SQL_FETCHROW($result)) {
+               $OUT = ""; $SW = 2;
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Prepare data for the row template
+                       // @TODO Rewritings: subj->subject in template
                        $content = array(
                                'sw'   => $SW,
-                               'id'   => $id,
-                               'subj' => $subj,
-                               'uid'  => ADMIN_USER_PROFILE_LINK($sender),
-                               'pay'  => GET_PAYMENT($pay),
-                               'cat'  => GET_CATEGORY($cat),
+                               'id'   => $content['id'],
+                               'subj' => $content['subject'],
+                               'uid'  => ADMIN_USER_PROFILE_LINK($content['sender']),
+                               'pay'  => GET_PAYMENT($content['payment_id']),
+                               'cat'  => GET_CATEGORY($content['cat_id']),
                        );
 
                        // Load row template and switch colors
@@ -102,6 +104,8 @@ WHERE id=%s LIMIT 1",
 
                // Free memory
                SQL_FREERESULT($result);
+
+               // @TODO Yet another constant to rewrite
                define('__EMAIL_SELECT_ROWS', $OUT);
 
                // Load email template
@@ -109,7 +113,7 @@ WHERE id=%s LIMIT 1",
        }
 } else {
        // No mail orders left in pool
-       OUTPUT_HTML("<span class=\"admin_failed\">".ADMIN_NO_MAILS_IN_POOL."</span>");
+       LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"admin_failed\">{--ADMIN_NO_MAILS_IN_POOL--}</span>");
 }
 
 //