X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=459ea16c3bb665db23eccef1eea5cacb46a0e7a8;hb=2272afc569a7b308e6c34a2d28457495e6b2483b;hp=b3d19ef974405dd29b3e2aa5198f859c9e5a89a5;hpb=70092aaf314be7367d955757e4bcd2407ffd910e;p=mailer.git diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index b3d19ef974..459ea16c3b 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`, `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) { + 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 = ''; // Maybe he can win his active beg? - if ($cnt <= getConfig('beg_ranks')) { + if ($count <= getBegRanks()) { // Mark him $WIN1 = ''; $WIN2 = ''; @@ -87,50 +93,47 @@ 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, + 'cnt' => $count, ); // Load template and add it $OUT .= loadTemplate('admin_list_beg_rows', true, $content); - $SW = 3 - $SW; $cnt++; $total += $content['beg_points']; - } + $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, "