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

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

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index ab4b87de3588b014c08845248f24cdd5ad3bf500..1dbaf06ffbeadc03ed0af6346c555ec4446e0920 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -67,7 +67,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
        if (SQL_NUMROWS($result) > 0) {
                // List users
                $OUT = "";$SW = 2; $cnt = 1; $total = 0;
-               while (list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= getConfig('beg_ranks')) {
@@ -77,14 +77,16 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        } // END - if
 
                        // Prepare content
+                       // @TODO Rewrite templates so s/fname will be replaced by surname/family
+                       // @TODO to shorten this block. Please also do so with uid->userid
                        $content = array(
-                               'uid'    => $uid,
-                               'email'  => CREATE_EMAIL_LINK($email, "user_data"),
-                               'gender' => TRANSLATE_GENDER($gender),
-                               'sname'  => $sname,
-                               'fname'  => $fname,
-                               'turbo'  => TRANSLATE_COMMA($turbo),
-                               'last'   => MAKE_DATETIME($last, "2"),
+                               'uid'    => $content['userid'],
+                               'email'  => CREATE_EMAIL_LINK($content['email'], "user_data"),
+                               'gender' => TRANSLATE_GENDER($content['gender']),
+                               'sname'  => $content['surname'],
+                               'fname'  => $content['family'],
+                               'turbo'  => TRANSLATE_COMMA($content['beg_points']),
+                               'last'   => MAKE_DATETIME($content['last_online'], "2"),
                                'sw'     => $SW,
                                'win1'   => $WIN1,
                                'win2'   => $WIN2,
@@ -93,7 +95,7 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 
                        // Load template and add it
                        $OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content);
-                       $SW = 3 - $SW; $cnt++; $total += $turbo;
+                       $SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
                }
                define('__BEG_ROWS', $OUT);
                define('__TOTAL', TRANSLATE_COMMA($total));