github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 13:24:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Minor improvements (#1263)

Browse source
This commit is contained in:
Roman Kelesidis 2023-12-26 17:48:28 +07:00 • committed by GitHub
commit b16ee57faf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
library/includes/functions.php
View file

@ -2175,9 +2175,9 @@ function user_birthday_icon($user_birthday, $user_id): string
* Returns information about user ban * Returns information about user ban
* *
* @param int $userId * @param int $userId
* @return array * @return array|null
*/ */
function getUserBanInfo(int $userId): array function getUserBanInfo(int $userId): ?array
{ {
return DB()->fetch_row("SELECT * FROM " . BB_BANLIST . " WHERE ban_userid = $userId LIMIT 1"); return DB()->fetch_row("SELECT * FROM " . BB_BANLIST . " WHERE ban_userid = $userId LIMIT 1");
} }
@ -2185,9 +2185,9 @@ function getUserBanInfo(int $userId): array
/** /**
* Returns information about all bans * Returns information about all bans
* *
* @return array * @return array|null
*/ */
function getAllBans(): array function getAllBans(): ?array
{ {
return DB()->fetch_rowset("SELECT * FROM " . BB_BANLIST); return DB()->fetch_rowset("SELECT * FROM " . BB_BANLIST);
} }

2
library/includes/init_bb.php
View file

@ -397,7 +397,7 @@ $userdata =& $user->data;
/** /**
* Initial ban check * Initial ban check
*/ */
if ($banInfo = getUserBanInfo($user->id)) { if ($banInfo = getUserBanInfo((int)$user->id)) {
if (!IS_GUEST) { if (!IS_GUEST) {
$user->session_end(); $user->session_end();
} }

2
library/includes/ucp/viewprofile.php
View file

@ -75,7 +75,7 @@ if (bf($profiledata['user_opt'], 'user_opt', 'dis_sig')) {
} }
// Ban information // Ban information
if ($banInfo = getUserBanInfo($profiledata['user_id'])) { if ($banInfo = getUserBanInfo((int)$profiledata['user_id'])) {
$template->assign_block_vars('ban', [ $template->assign_block_vars('ban', [
'IS_BANNED' => true, 'IS_BANNED' => true,
'BAN_REASON' => $banInfo['ban_reason'] 'BAN_REASON' => $banInfo['ban_reason']

2
styles/templates/default/usercp_viewprofile.tpl
View file

@ -295,7 +295,9 @@ ajax.callback.index_data = function(data) {
<th>{L_USERNAME}:</th> <th>{L_USERNAME}:</th>
<td id="username"> <td id="username">
<span class="editable bold">{USERNAME}</span> <span class="editable bold">{USERNAME}</span>
<!-- BEGIN ban -->
<!-- IF ban.IS_BANNED --><b title="{L_BANNED_USERS}" style="color: red;">{L_BANNED}</b><!-- ENDIF --> <!-- IF ban.IS_BANNED --><b title="{L_BANNED_USERS}" style="color: red;">{L_BANNED}</b><!-- ENDIF -->
<!-- END ban -->
</td> </td>
</tr> </tr>
<!-- IF SHOW_ROLE --> <!-- IF SHOW_ROLE -->

3
styles/templates/default/viewtopic.tpl
View file

@ -361,7 +361,10 @@ function build_poll_add_form (src_el)
<p class="nick">{postrow.POSTER_NAME} <!-- IF postrow.POSTER_AUTHOR --><sup>&reg;</sup><!-- ENDIF --></p> <p class="nick">{postrow.POSTER_NAME} <!-- IF postrow.POSTER_AUTHOR --><sup>&reg;</sup><!-- ENDIF --></p>
<!-- ENDIF --> <!-- ENDIF -->
<!-- BEGIN ban -->
<!-- IF postrow.ban.IS_BANNED --><p class="poster-banned" title="{L_BANNED_USERS}">{L_BANNED}</p><!-- ENDIF --> <!-- IF postrow.ban.IS_BANNED --><p class="poster-banned" title="{L_BANNED_USERS}">{L_BANNED}</p><!-- ENDIF -->
<!-- END ban -->
<!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF --> <!-- IF postrow.POSTER_RANK --><p class="rank_txt">{postrow.POSTER_RANK}</p><!-- ENDIF -->
<!-- IF postrow.RANK_IMAGE --><p class="rank_img">{postrow.RANK_IMAGE}</p><!-- ENDIF --> <!-- IF postrow.RANK_IMAGE --><p class="rank_img">{postrow.RANK_IMAGE}</p><!-- ENDIF -->
<!-- IF postrow.POSTER_AVATAR --><p class="avatar">{postrow.POSTER_AVATAR}</p><!-- ENDIF --> <!-- IF postrow.POSTER_AVATAR --><p class="avatar">{postrow.POSTER_AVATAR}</p><!-- ENDIF -->

2
viewtopic.php
View file

@ -736,7 +736,7 @@ for ($i = 0; $i < $total_posts; $i++) {
]); ]);
// Ban information // Ban information
if ($banInfo = getUserBanInfo($poster_id)) { if ($banInfo = getUserBanInfo((int)$poster_id)) {
$template->assign_block_vars('postrow.ban', [ $template->assign_block_vars('postrow.ban', [
'IS_BANNED' => true, 'IS_BANNED' => true,
'BAN_REASON' => $banInfo['ban_reason'] 'BAN_REASON' => $banInfo['ban_reason']