A lot code rewritten:

[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 ebe814aa938c22f0d6cbe27627f868b3ddd6eacd..5504a22b3d0c0b48293eaf03eab37b723035ca0b 100644 (file)
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -52,27 +52,30 @@ if (getConfig('beg_rallye') == 'Y') {
                $curr = date('m', time()) - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
                updateConfiguration('last_month', $curr);
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_WITHDRAW_PREPARED--}');
        } // END - if
 
        // Autopurge installed?
-       $lastOnline = "%s"; $ONLINE = '';
+       $lastOnline = '';
        if (isExtensionActive('autopurge')) {
                // Use last online timestamp to keep inactive members away from here
-               $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-               $ONLINE = getConfig('ap_inactive_since');
+               $lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
        } // END - if
 
        // Check if at least one is in the active rallye
-       $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
-ORDER BY beg_points DESC, last_online DESC, userid",
-       array($ONLINE), __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `userid`, `gender`, `surname`, `family`, `email`, `beg_points`, `last_online`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+WHERE
+       `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
+ORDER BY
+       `beg_points` DESC,
+       `last_online` DESC,
+       `userid` ASC", __FILE__, __LINE__);
 
        if (SQL_NUMROWS($result) > 0) {
                // List users
-               $OUT = '';$SW = 2; $cnt = 1; $total = '0';
+               $OUT = ''; $cnt = 1; $total = '0';
                while ($content = SQL_FETCHARRAY($result)) {
                        // Init variables
                        $WIN1 = ''; $WIN2 = '';
@@ -88,12 +91,9 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                        $content = array(
                                'userid'      => $content['userid'],
                                'email'       => generateEmailLink($content['email'], 'user_data'),
-                               'gender'      => translateGender($content['gender']),
-                               'surname'     => $content['surname'],
-                               'family'      => $content['family'],
-                               'turbo'       => translateComma($content['beg_points']),
+                               'gender'      => $content['gender'],
+                               'turbo'       => $content['beg_points'],
                                'last_online' => generateDateTime($content['last_online'], 2),
-                               'sw'          => $SW,
                                'win1'        => $WIN1,
                                'win2'        => $WIN2,
                                'cnt'         => $cnt,
@@ -101,8 +101,8 @@ ORDER BY beg_points DESC, last_online DESC, userid",
 
                        // Load template and add it
                        $OUT .= loadTemplate('admin_list_beg_rows', true, $content);
-                       $SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
-               }
+                       $cnt++; $total += $content['beg_points'];
+               } // END - while
 
                $content['rows']  = $OUT;
                $content['total'] = translateComma($total);
@@ -127,11 +127,11 @@ ORDER BY beg_points DESC, last_online DESC, userid",
                loadTemplate('admin_list_beg', false, $content);
        } else {
                // No one has joined the begging rallye...
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_NO_RALLYE--}');
        }
 } else {
        // Rallye deactivated
-       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+       loadTemplate('admin_settings_saved', false, '{--ADMIN_BEG_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]