Missing column 'active_bonus' fixed, some while() loops rewritten

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

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index d2354860045d7f7030b094275ea4b7cfe511e72a..c6b44cf930fd63d3f4ac9274cd849d398dd13500 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -74,16 +74,19 @@ if ($_CONFIG['bonus_active'] == "Y") {
        }
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online
+       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS points, last_online
 FROM "._MYSQL_PREFIX."_user_data
 WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
-ORDER BY active_bonus DESC, last_online DESC, userid",
+ORDER BY points DESC, last_online DESC, userid",
         array($ONLINE), __FILE__, __LINE__);
 
        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)) {
+                       // Add total points
+                       $total += $content['points'];
+
                        // Generate array fore the dynamic template
                        $WIN1 = ""; $WIN2 = "";
                        if ($cnt <= $_CONFIG['bonus_ranks']) {
@@ -93,23 +96,18 @@ ORDER BY active_bonus DESC, last_online DESC, userid",
                        }
 
                        // Prepare content
-                       $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"),
-                               'sw'     => $SW,
-                               'win1'   => $WIN1,
-                               'win2'   => $WIN2,
-                               'cnt'    => $cnt,
-                       );
+                       $content['email']  = CREATE_EMAIL_LINK($content['email'], "user_data");
+                       $content['gender'] = TRANSLATE_GENDER($content['gender']);
+                       $content['points'] = TRANSLATE_COMMA($content['points']);
+                       $content['last']   = MAKE_DATETIME($content['last'], "2");
+                       $content['sw']     = $SW;
+                       $content['win1']   = $WIN1;
+                       $content['win2']   = $WIN2;
+                       $content['cnt'     = $cnt;
 
                        // Load template and add it
                        $OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content);
-                       $SW = 3 - $SW; $cnt++; $total += $turbo;
+                       $SW = 3 - $SW; $cnt++;
                }
                define('__BONUS_ROWS', $OUT);
                define('__TOTAL', TRANSLATE_COMMA($total));