X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=459ea16c3bb665db23eccef1eea5cacb46a0e7a8;hb=2272afc569a7b308e6c34a2d28457495e6b2483b;hp=ed8b864cd4847370035fe5f55aaa3148c60a0976;hpb=fe559c0f67e986c113f5b465e767e11a6588734d;p=mailer.git diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index ed8b864cd4..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 = ''; - 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/fname will be replaced by surname/family - // @TODO to shorten this block. Please also do so with uid->userid $content = array( - 'uid' => $content['userid'], - 'email' => generateMemberEmailLink($content['email'], "user_data"), - 'gender' => translateGender($content['gender']), - 'sname' => $content['surname'], - 'fname' => $content['family'], - 'turbo' => translateComma($content['beg_points']), - 'last' => generateDateTime($content['last_online'], '2'), - 'sw' => $SW, - 'win1' => $WIN1, - 'win2' => $WIN2, - 'cnt' => $cnt, + 'userid' => $content['userid'], + 'email' => generateEmailLink($content['email'], 'user_data'), + 'gender' => $content['gender'], + 'turbo' => $content['beg_points'], + 'last_online' => generateDateTime($content['last_online'], 2), + 'win1' => $WIN1, + 'win2' => $WIN2, + 'cnt' => $count, ); // Load template and add it - $OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content); - $SW = 3 - $SW; $cnt++; $total += $content['beg_points']; - } - define('__BEG_ROWS', $OUT); - define('__TOTAL', translateComma($total)); + $OUT .= loadTemplate('admin_list_beg_rows', true, $content); + $count++; $total += $content['beg_points']; + } // END - while + + $content['rows'] = $OUT; + $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 - define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true)); + $content['withdraw_form'] = loadTemplate('admin_list_beg_form', true); } else { // Display message "no manual withdraw possible" - define('__BEG_WITHDRAW_FORM', "