X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=0ca6ad17229f2c8b55413086a8bf2ef7410c05db;hb=eefb72c90c4d30b82b9277acd42754dca014302b;hp=f665ea2209063ff8f8077d26f2d0b82c92f1118b;hpb=dbb6aa4eaeff7c3bab27f143d881781380d43d41;p=mailer.git diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index f665ea2209..0ca6ad1722 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -1,7 +1,7 @@ 0))) { // 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 (UNIX_TIMESTAMP() - `last_online`) < {?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`,`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) { + if (!SQL_HASZERONUMS($result)) { // List users - $OUT = '';$SW = 2; $cnt = 1; $total = 0; + $OUT = ''; $count = 1; $total = '0'; while ($content = SQL_FETCHARRAY($result)) { // Init variables $WIN1 = ''; $WIN2 = ''; - if ($cnt <= getConfig('beg_ranks')) { - // Maybe he can win his active beg? - $WIN1 = ""; - $WIN2 = ""; + + // Maybe he can win his active beg? + if ($count <= getBegRanks()) { + // Mark him + $WIN1 = ''; + $WIN2 = ''; } // END - if // Prepare content - // @TODO Rewrite templates so s/family will be replaced by surname/family - // @TODO to shorten this block. Please also do so with userid->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']), - 'last_online' => generateDateTime($content['last_online'], 2), - 'sw' => $SW, - 'win1' => $WIN1, - 'win2' => $WIN2, - 'cnt' => $cnt, + $row = array( + 'userid' => $content['userid'], + 'email' => generateEmailLink($content['email'], 'user_data'), + 'last_online' => generateDateTime($content['last_online'], '2'), + 'win1' => $WIN1, + 'win2' => $WIN2, + 'count' => $count, ); // Load template and add it - $OUT .= loadTemplate('admin_list_beg_rows', true, $content); - $SW = 3 - $SW; $cnt++; $total += $content['beg_points']; - } + $OUT .= loadTemplate('admin_list_beg_rows', true, $row); + $count++; + $total += $content['beg_points']; + } // END - while $content['rows'] = $OUT; - $content['total'] = translateComma($total); + $content['total_points'] = $total; // Check if we need to display form or not with manuel withdraw - if (getConfig('last_month') == date('m', time())) { + if (getLastMonth() == getMonth()) { // Load form $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, "