mirror of
https://github.com/torrentpier/torrentpier
synced 2025-08-20 21:33:54 -07:00
Fixed broken sorting in group.php (#1221)
* Fixed broken sorting in group.php * Update CHANGELOG.md
This commit is contained in:
parent
1da4d46822
commit
b5891ca663
7 changed files with 17 additions and 10 deletions
|
@ -21,6 +21,7 @@
|
||||||
- Some reported bugfixes [\#1214](https://github.com/torrentpier/torrentpier/pull/1214) ([belomaxorka](https://github.com/belomaxorka))
|
- Some reported bugfixes [\#1214](https://github.com/torrentpier/torrentpier/pull/1214) ([belomaxorka](https://github.com/belomaxorka))
|
||||||
- Minor improvements [\#1215](https://github.com/torrentpier/torrentpier/pull/1215), [\#1217](https://github.com/torrentpier/torrentpier/pull/1217), [\#1219](https://github.com/torrentpier/torrentpier/pull/1219), [\#1220](https://github.com/torrentpier/torrentpier/pull/1220) ([belomaxorka](https://github.com/belomaxorka))
|
- Minor improvements [\#1215](https://github.com/torrentpier/torrentpier/pull/1215), [\#1217](https://github.com/torrentpier/torrentpier/pull/1217), [\#1219](https://github.com/torrentpier/torrentpier/pull/1219), [\#1220](https://github.com/torrentpier/torrentpier/pull/1220) ([belomaxorka](https://github.com/belomaxorka))
|
||||||
- Fixed extensions issue [\#1218](https://github.com/torrentpier/torrentpier/pull/1218) ([belomaxorka](https://github.com/belomaxorka))
|
- Fixed extensions issue [\#1218](https://github.com/torrentpier/torrentpier/pull/1218) ([belomaxorka](https://github.com/belomaxorka))
|
||||||
|
- Fixed broken sorting in group.php [\#1221](https://github.com/torrentpier/torrentpier/pull/1221) ([belomaxorka](https://github.com/belomaxorka))
|
||||||
|
|
||||||
## [v2.4.0-rc2](https://github.com/torrentpier/torrentpier/tree/v2.4.0-rc2) (2023-12-12)
|
## [v2.4.0-rc2](https://github.com/torrentpier/torrentpier/tree/v2.4.0-rc2) (2023-12-12)
|
||||||
[Full Changelog](https://github.com/torrentpier/torrentpier/compare/v2.4.0-rc1...v2.4.0-rc2)
|
[Full Changelog](https://github.com/torrentpier/torrentpier/compare/v2.4.0-rc1...v2.4.0-rc2)
|
||||||
|
|
|
@ -385,11 +385,13 @@ if (!$group_id) {
|
||||||
'MOD_AVATAR' => $moderator_info['avatar'],
|
'MOD_AVATAR' => $moderator_info['avatar'],
|
||||||
'MOD_FROM' => $moderator_info['from'],
|
'MOD_FROM' => $moderator_info['from'],
|
||||||
'MOD_JOINED' => $moderator_info['joined'],
|
'MOD_JOINED' => $moderator_info['joined'],
|
||||||
|
'MOD_JOINED_RAW' => $moderator_info['joined_raw'],
|
||||||
'MOD_POSTS' => $moderator_info['posts'],
|
'MOD_POSTS' => $moderator_info['posts'],
|
||||||
'MOD_PM' => $moderator_info['pm'],
|
'MOD_PM' => $moderator_info['pm'],
|
||||||
'MOD_EMAIL' => $moderator_info['email'],
|
'MOD_EMAIL' => $moderator_info['email'],
|
||||||
'MOD_WWW' => $moderator_info['www'],
|
'MOD_WWW' => $moderator_info['www'],
|
||||||
'MOD_TIME' => !empty($group_info['mod_time']) ? sprintf('%s <span class="signature">(%s)</span>', bb_date($group_info['mod_time']), delta_time($group_info['mod_time'])) : $lang['NONE'],
|
'MOD_TIME' => !empty($group_info['mod_time']) ? sprintf('%s <span class="signature">(%s)</span>', bb_date($group_info['mod_time']), delta_time($group_info['mod_time'])) : $lang['NONE'],
|
||||||
|
'MOD_TIME_RAW' => !empty($group_info['mod_time']) ? $group_info['mod_time'] : '',
|
||||||
'U_SEARCH_USER' => 'search.php?mode=searchuser',
|
'U_SEARCH_USER' => 'search.php?mode=searchuser',
|
||||||
'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
|
'U_SEARCH_RELEASES' => "tracker.php?srg=$group_id",
|
||||||
'U_GROUP_RELEASES' => GROUP_URL . $group_id . "&view=releases",
|
'U_GROUP_RELEASES' => GROUP_URL . $group_id . "&view=releases",
|
||||||
|
@ -518,12 +520,14 @@ if (!$group_id) {
|
||||||
'AVATAR_IMG' => $member_info['avatar'],
|
'AVATAR_IMG' => $member_info['avatar'],
|
||||||
'FROM' => $member_info['from'],
|
'FROM' => $member_info['from'],
|
||||||
'JOINED' => $member_info['joined'],
|
'JOINED' => $member_info['joined'],
|
||||||
|
'JOINED_RAW' => $member_info['joined_raw'],
|
||||||
'POSTS' => $member_info['posts'],
|
'POSTS' => $member_info['posts'],
|
||||||
'USER_ID' => $user_id,
|
'USER_ID' => $user_id,
|
||||||
'PM' => $member_info['pm'],
|
'PM' => $member_info['pm'],
|
||||||
'EMAIL' => $member_info['email'],
|
'EMAIL' => $member_info['email'],
|
||||||
'WWW' => $member_info['www'],
|
'WWW' => $member_info['www'],
|
||||||
'TIME' => $member_info['user_time']
|
'TIME' => $member_info['user_time'],
|
||||||
|
'TIME_RAW' => $member_info['user_time_raw']
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($is_moderator) {
|
if ($is_moderator) {
|
||||||
|
@ -572,6 +576,7 @@ if (!$group_id) {
|
||||||
'USER' => profile_url($pending_info),
|
'USER' => profile_url($pending_info),
|
||||||
'FROM' => $pending_info['from'],
|
'FROM' => $pending_info['from'],
|
||||||
'JOINED' => $pending_info['joined'],
|
'JOINED' => $pending_info['joined'],
|
||||||
|
'JOINED_RAW' => $pending_info['joined_raw'],
|
||||||
'POSTS' => $pending_info['posts'],
|
'POSTS' => $pending_info['posts'],
|
||||||
'USER_ID' => $user_id,
|
'USER_ID' => $user_id,
|
||||||
'PM' => $pending_info['pm'],
|
'PM' => $pending_info['pm'],
|
||||||
|
|
|
@ -811,7 +811,7 @@ function generate_user_info($row, bool $have_auth = IS_ADMIN): array
|
||||||
$www = $lang['NOSELECT'];
|
$www = $lang['NOSELECT'];
|
||||||
}
|
}
|
||||||
|
|
||||||
return ['from' => $from, 'joined' => $joined, 'posts' => $posts, 'pm' => $pm, 'avatar' => $avatar, 'user_time' => $user_time, 'email' => $email, 'www' => $www];
|
return ['from' => $from, 'joined' => $joined, 'joined_raw' => $row['user_regdate'], 'posts' => $posts, 'pm' => $pm, 'avatar' => $avatar, 'user_time' => $user_time, 'user_time_raw' => $row['user_time'], 'email' => $email, 'www' => $www];
|
||||||
}
|
}
|
||||||
|
|
||||||
function get_bt_userdata($user_id)
|
function get_bt_userdata($user_id)
|
||||||
|
|
|
@ -532,7 +532,6 @@ $lang['SEARCH_USER_TOPICS'] = 'Find user topics'; // Find all topics by username
|
||||||
$lang['NO_USER_ID_SPECIFIED'] = 'Sorry, but that user does not exist.';
|
$lang['NO_USER_ID_SPECIFIED'] = 'Sorry, but that user does not exist.';
|
||||||
$lang['WRONG_PROFILE'] = 'You cannot modify a profile that is not your own.';
|
$lang['WRONG_PROFILE'] = 'You cannot modify a profile that is not your own.';
|
||||||
|
|
||||||
$lang['ONLY_ONE_AVATAR'] = 'Only one type of avatar can be specified';
|
|
||||||
$lang['FILE_NO_DATA'] = 'The file at the URL you gave contains no data';
|
$lang['FILE_NO_DATA'] = 'The file at the URL you gave contains no data';
|
||||||
$lang['NO_CONNECTION_URL'] = 'A connection could not be made to the URL you gave';
|
$lang['NO_CONNECTION_URL'] = 'A connection could not be made to the URL you gave';
|
||||||
$lang['INCOMPLETE_URL'] = 'The URL you entered is incomplete';
|
$lang['INCOMPLETE_URL'] = 'The URL you entered is incomplete';
|
||||||
|
|
|
@ -816,6 +816,7 @@ else {
|
||||||
'TOPIC_AUTHOR' => profile_url(array('username' => $topic['first_username'], 'user_id' => $topic['first_user_id'], 'user_rank' => $topic['first_user_rank'])),
|
'TOPIC_AUTHOR' => profile_url(array('username' => $topic['first_username'], 'user_id' => $topic['first_user_id'], 'user_rank' => $topic['first_user_rank'])),
|
||||||
'LAST_POSTER' => profile_url(array('username' => $topic['last_username'], 'user_id' => $topic['last_user_id'], 'user_rank' => $topic['last_user_rank'])),
|
'LAST_POSTER' => profile_url(array('username' => $topic['last_username'], 'user_id' => $topic['last_user_id'], 'user_rank' => $topic['last_user_rank'])),
|
||||||
'LAST_POST_TIME' => bb_date($topic['topic_last_post_time']),
|
'LAST_POST_TIME' => bb_date($topic['topic_last_post_time']),
|
||||||
|
'LAST_POST_TIME_RAW' => $topic['topic_last_post_time'],
|
||||||
'LAST_POST_ID' => $topic['topic_last_post_id'],
|
'LAST_POST_ID' => $topic['topic_last_post_id'],
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
|
@ -141,7 +141,7 @@
|
||||||
<th width="10%" class="{sorter: 'digit'}"><b class="tbs-text">{L_JOINED}</b></th>
|
<th width="10%" class="{sorter: 'digit'}"><b class="tbs-text">{L_JOINED}</b></th>
|
||||||
<th class="{sorter: 'digit'}"><b class="tbs-text">{L_POSTS_SHORT}</b></th>
|
<th class="{sorter: 'digit'}"><b class="tbs-text">{L_POSTS_SHORT}</b></th>
|
||||||
<th class="{sorter: false}"><b class="tbs-text">{L_WEBSITE}</b></th>
|
<th class="{sorter: false}"><b class="tbs-text">{L_WEBSITE}</b></th>
|
||||||
<th width="10%" class="{sorter: false}"><b class="tbs-text">{L_EFFECTIVE_DATE}</b></th>
|
<th width="10%" class="{sorter: 'digit'}"><b class="tbs-text">{L_EFFECTIVE_DATE}</b></th>
|
||||||
<th class="{sorter: false}"><b class="tbs-text">#</b></th>
|
<th class="{sorter: false}"><b class="tbs-text">#</b></th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -154,10 +154,10 @@
|
||||||
<td>{MOD_PM}</td>
|
<td>{MOD_PM}</td>
|
||||||
<td>{MOD_EMAIL}</td>
|
<td>{MOD_EMAIL}</td>
|
||||||
<td>{MOD_FROM}</td>
|
<td>{MOD_FROM}</td>
|
||||||
<td class="small">{MOD_JOINED}</td>
|
<td class="small"><u>{MOD_JOINED_RAW}</u>{MOD_JOINED}</td>
|
||||||
<td>{MOD_POSTS}</td>
|
<td>{MOD_POSTS}</td>
|
||||||
<td>{MOD_WWW}</td>
|
<td>{MOD_WWW}</td>
|
||||||
<td class="small">{MOD_TIME}</td>
|
<td class="small"><u>{MOD_TIME_RAW}</u>{MOD_TIME}</td>
|
||||||
<td width="3%"> </td>
|
<td width="3%"> </td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
|
@ -173,10 +173,10 @@
|
||||||
<td>{member.PM}</td>
|
<td>{member.PM}</td>
|
||||||
<td>{member.EMAIL}</td>
|
<td>{member.EMAIL}</td>
|
||||||
<td>{member.FROM}</td>
|
<td>{member.FROM}</td>
|
||||||
<td class="small">{member.JOINED}</td>
|
<td class="small"><u>{member.JOINED_RAW}</u>{member.JOINED}</td>
|
||||||
<td>{member.POSTS}</td>
|
<td>{member.POSTS}</td>
|
||||||
<td>{member.WWW}</td>
|
<td>{member.WWW}</td>
|
||||||
<td class="small">{member.TIME}</td>
|
<td class="small"><u>{member.TIME_RAW}</u>{member.TIME}</td>
|
||||||
<td width="3%">
|
<td width="3%">
|
||||||
<!-- BEGIN switch_mod_option -->
|
<!-- BEGIN switch_mod_option -->
|
||||||
<input type="checkbox" name="members[]" value="{member.USER_ID}"/>
|
<input type="checkbox" name="members[]" value="{member.USER_ID}"/>
|
||||||
|
@ -253,7 +253,7 @@
|
||||||
<td>{pending.PM}</td>
|
<td>{pending.PM}</td>
|
||||||
<td>{pending.EMAIL}</td>
|
<td>{pending.EMAIL}</td>
|
||||||
<td>{pending.FROM}</td>
|
<td>{pending.FROM}</td>
|
||||||
<td>{pending.JOINED}</td>
|
<td><u>{pending.JOINED_RAW}</u>{pending.JOINED}</td>
|
||||||
<td>{pending.POSTS}</td>
|
<td>{pending.POSTS}</td>
|
||||||
<td>{pending.WWW}</td>
|
<td>{pending.WWW}</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -152,7 +152,7 @@ function show_edit_options ()
|
||||||
<th class="{sorter: 'text'}" title="{L_TOPICS}"><b class="tbs-text">{L_TOPICS}</b></th>
|
<th class="{sorter: 'text'}" title="{L_TOPICS}"><b class="tbs-text">{L_TOPICS}</b></th>
|
||||||
<th class="{sorter: 'text'}" title="{L_AUTHOR}"><b class="tbs-text">{L_AUTHOR}</b></th>
|
<th class="{sorter: 'text'}" title="{L_AUTHOR}"><b class="tbs-text">{L_AUTHOR}</b></th>
|
||||||
<th class="{sorter: 'digit'}" title="{L_REPLIES}"><b class="tbs-text">{L_REPLIES_SHORT}</b></th>
|
<th class="{sorter: 'digit'}" title="{L_REPLIES}"><b class="tbs-text">{L_REPLIES_SHORT}</b></th>
|
||||||
<th class="{sorter: 'text'}" title="{L_LASTPOST}"><b class="tbs-text">{L_LASTPOST}</b></th>
|
<th class="{sorter: 'digit'}" title="{L_LASTPOST}"><b class="tbs-text">{L_LASTPOST}</b></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<!-- BEGIN t -->
|
<!-- BEGIN t -->
|
||||||
|
@ -181,6 +181,7 @@ function show_edit_options ()
|
||||||
<td class="med nowrap">{t.TOPIC_AUTHOR}</td>
|
<td class="med nowrap">{t.TOPIC_AUTHOR}</td>
|
||||||
<td title="{L_REPLIES}: {t.REPLIES}" class="small">{t.REPLIES}</td>
|
<td title="{L_REPLIES}: {t.REPLIES}" class="small">{t.REPLIES}</td>
|
||||||
<td class="small nowrap" style="padding: 1px 4px 3px 4px;">
|
<td class="small nowrap" style="padding: 1px 4px 3px 4px;">
|
||||||
|
<u>{t.LAST_POST_TIME_RAW}</u>
|
||||||
<p>{t.LAST_POST_TIME}</p>
|
<p>{t.LAST_POST_TIME}</p>
|
||||||
<p>
|
<p>
|
||||||
{t.LAST_POSTER}
|
{t.LAST_POSTER}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue