mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 15:31:42 +02:00
Code Issues Releases Wiki Activity

[ticket/9687] Add separate column for user_id

Browse Source 
PHPBB3-9687
This commit is contained in:
Marc Alexander
2023-07-31 11:53:33 +02:00
parent f9a0e4d606
commit 0414536727
6 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/ban/manager.php
View File

@@ -307,9 +307,12 @@ class manager
$manual_modes[] = $ban_mode;
continue;
}
$where_column = $user_column == 'user_id' ? 'b.ban_userid' : 'b.ban_item';
$where_array[] = ['AND',
[
['b.ban_item', '=', 'u.' . $user_column],
[$where_column, '=', 'u.' . $user_column],
['b.ban_mode', '=', "'{$ban_mode->get_type()}'"],
],
];

31
phpBB/phpbb/ban/type/user.php
View File

@@ -73,40 +73,21 @@ class user extends base
public function get_ban_options(): array
{
$ban_options = [];
$ban_data = [];
$user_ids = [];
$sql = 'SELECT b.*
FROM ' . $this->bans_table . ' b
$sql = 'SELECT b.*, u.user_id, u.username, u.username_clean
FROM ' . $this->bans_table . ' b, ' . $this->users_table . ' u
WHERE (b.ban_end >= ' . time() . "
OR b.ban_end = 0)
AND b.ban_mode = '{$this->get_type()}'";
AND b.ban_userid = u.user_id
AND b.ban_mode = '{$this->get_type()}'
ORDER BY username_clean";
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$user_ids[] = $row['ban_item'];
$ban_data[$row['ban_item']] = $row;
$ban_options[] = $row;
}
$this->db->sql_freeresult($result);
if (count($user_ids))
{
// Grab usernames for banned user IDs
$sql = 'SELECT user_id, username, username_clean
FROM ' . $this->users_table . '
WHERE ' . $this->db->sql_in_set('user_id', $user_ids) . '
ORDER BY username_clean';
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$ban_options[] = array_merge(
$ban_data[$row['user_id']],
$row
);
}
$this->db->sql_freeresult($result);
}
return $ban_options;
}