github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed broken ordering in memberlist.php (#1010)

Browse source
This commit is contained in:
Roman Kelesidis 2023-10-29 10:34:26 +07:00 • committed by GitHub
commit 149f2003f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
memberlist.php
View file

@ -63,16 +63,6 @@ if ($sort_order == 'ASC') {
} }
$select_sort_order .= '</select>'; $select_sort_order .= '</select>';
//
// Generate page
//
$template->assign_vars([
'S_MODE_SELECT' => $select_sort_mode,
'S_ORDER_SELECT' => $select_sort_order,
'S_MODE_ACTION' => 'memberlist.php',
'S_USERNAME' => $paginationusername,
]);
switch ($mode) { switch ($mode) {
case 'joined': case 'joined':
$order_by = "user_id $sort_order LIMIT $start, " . $bb_cfg['topics_per_page']; $order_by = "user_id $sort_order LIMIT $start, " . $bb_cfg['topics_per_page'];
@ -139,11 +129,6 @@ $select_letter .= ($by_letter == 'others') ? '<b>' . $lang['OTHERS'] . '</b>&nbs
$select_letter .= ':&nbsp;'; $select_letter .= ':&nbsp;';
$select_letter .= ($by_letter == 'all') ? '<b>' . $lang['ALL'] . '</b>' : '<a class="genmed" href="' . ("memberlist.php?letter=all&amp;mode=$mode&amp;order=$sort_order") . '">' . $lang['ALL'] . '</a>'; $select_letter .= ($by_letter == 'all') ? '<b>' . $lang['ALL'] . '</b>' : '<a class="genmed" href="' . ("memberlist.php?letter=all&amp;mode=$mode&amp;order=$sort_order") . '">' . $lang['ALL'] . '</a>';
$template->assign_vars([
'S_LETTER_SELECT' => $select_letter,
'S_LETTER_HIDDEN' => '<input type="hidden" name="letter" value="' . $by_letter . '">',
]);
// per-letter selection end // per-letter selection end
$sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email, avatar_ext_id FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")"; $sql = "SELECT username, user_id, user_rank, user_opt, user_posts, user_regdate, user_from, user_website, user_email, avatar_ext_id FROM " . BB_USERS . " WHERE user_id NOT IN(" . EXCLUDED_USERS . ")";
if ($username) { if ($username) {
@ -179,7 +164,7 @@ if ($result = DB()->fetch_rowset($sql)) {
$template->assign_block_vars('no_username', ['NO_USER_ID_SPECIFIED' => $lang['NO_USER_ID_SPECIFIED']]); $template->assign_block_vars('no_username', ['NO_USER_ID_SPECIFIED' => $lang['NO_USER_ID_SPECIFIED']]);
} }
$paginationurl = "memberlist.php?mode=$mode&amp;order=$sort_order&amp;letter=$by_letter"; $paginationurl = "memberlist.php?letter=$by_letter&amp;mode=$mode&amp;order=$sort_order";
if ($paginationusername) { if ($paginationusername) {
$paginationurl .= "&amp;username=$paginationusername"; $paginationurl .= "&amp;username=$paginationusername";
} }
@ -196,6 +181,20 @@ if ($mode != 'topten' || $bb_cfg['topics_per_page'] < 10) {
DB()->sql_freeresult($result); DB()->sql_freeresult($result);
} }
$template->assign_vars(['PAGE_TITLE' => $lang['MEMBERLIST']]); //
// Generate page
//
$template->assign_vars([
'S_MODE_SELECT' => $select_sort_mode,
'S_ORDER_SELECT' => $select_sort_order,
'S_MODE_ACTION' => "memberlist.php?letter=$by_letter&amp;mode=$mode&amp;order=$sort_order",
'S_USERNAME' => $paginationusername,
]);
$template->assign_vars([
'PAGE_TITLE' => $lang['MEMBERLIST'],
'S_LETTER_SELECT' => $select_letter,
'S_LETTER_HIDDEN' => '<input type="hidden" name="letter" value="' . $by_letter . '">'
]);
print_page('memberlist.tpl'); print_page('memberlist.tpl');