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

[ticket/9687] Improve display of ban options and update tests

Browse Source 
PHPBB3-9687
This commit is contained in:
Marc Alexander
2023-07-30 09:35:06 +02:00
parent 7b551adb2b
commit dcbd4a54aa
7 changed files with 67 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/config/default/container/services_ban.yml
View File

@@ -22,6 +22,7 @@ services:
class: \phpbb\ban\type\email
arguments:
- '@dbal.conn'
- '%tables.bans%'
- '%tables.users%'
- '%tables.sessions%'
- '%tables.sessions_keys%'
@@ -32,6 +33,7 @@ services:
class: \phpbb\ban\type\ip
arguments:
- '@dbal.conn'
- '%tables.bans%'
- '%tables.users%'
- '%tables.sessions%'
- '%tables.sessions_keys%'
@@ -42,6 +44,7 @@ services:
class: \phpbb\ban\type\user
arguments:
- '@dbal.conn'
- '%tables.bans%'
- '%tables.users%'
- '%tables.sessions%'
- '%tables.sessions_keys%'

12
phpBB/phpbb/ban/type/base.php
View File

@@ -23,6 +23,9 @@ abstract class base implements type_interface
/** @var array */
protected $excluded;
/** @var string */
protected $bans_table;
/** @var string */
protected $sessions_keys_table;
@@ -39,11 +42,12 @@ abstract class base implements type_interface
* Creates a ban type.
*
* @param driver_interface $db A phpBB DBAL object
* @param string $users_table The users table
* @param string $sessions_table The sessions table
* @param string $sessions_keys_table The sessions keys table
* @param string $bans_table The bans table
* @param string $users_table The users table
* @param string $sessions_table The sessions table
* @param string $sessions_keys_table The sessions keys table
*/
public function __construct(driver_interface $db, string $users_table, string $sessions_table, string $sessions_keys_table)
public function __construct(driver_interface $db, string $bans_table, string $users_table, string $sessions_table, string $sessions_keys_table)
{
$this->db = $db;
$this->users_table = $users_table;

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

@@ -86,7 +86,7 @@ class user extends base
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$row['ban_item'] = $row['username'];
$row['ban_item'] = $row['username'] ?: $row['ban_item'];
$ban_options[] = $row;
}
$this->db->sql_freeresult($result);