makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9687] Further clean up ban manager and directly pass user

Browse source 
PHPBB3-9687
This commit is contained in:
Marc Alexander 2023-07-04 21:35:40 +02:00
parent 026d66dab2
commit 8a5a26be87
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/default/container/services_ban.yml
View file

@ -6,6 +6,7 @@ services:
- '@ban.type_collection' - '@ban.type_collection'
- '@cache' - '@cache'
- '@dbal.conn' - '@dbal.conn'
- '@user'
- '%tables.bans%' - '%tables.bans%'
- '%tables.users%' - '%tables.users%'

28
phpBB/phpbb/ban/manager.php
View file

@ -49,15 +49,17 @@ class manager
* @param \phpbb\di\service_collection $types A service collection containing all ban types * @param \phpbb\di\service_collection $types A service collection containing all ban types
* @param \phpbb\cache\service $cache A cache object * @param \phpbb\cache\service $cache A cache object
* @param \phpbb\db\driver\driver_interface $db A phpBB DBAL object * @param \phpbb\db\driver\driver_interface $db A phpBB DBAL object
* @param \phpbb\user $user User object
* @param string $bans_table The bans table * @param string $bans_table The bans table
* @param string $users_table The users table * @param string $users_table The users table
*/ */
public function __construct($types, \phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, $bans_table, $users_table = '') public function __construct($types, \phpbb\cache\service $cache, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $bans_table, $users_table = '')
{ {
$this->bans_table = $bans_table; $this->bans_table = $bans_table;
$this->cache = $cache; $this->cache = $cache;
$this->db = $db; $this->db = $db;
$this->types = $types; $this->types = $types;
$this->user = $user;
$this->users_table = $users_table; $this->users_table = $users_table;
} }
@ -264,7 +266,7 @@ class manager
* *
* @return array|bool * @return array|bool
*/ */
public function get_bans($mode) public function get_bans(string $mode)
{ {
/** @var type_interface $ban_mode */ /** @var type_interface $ban_mode */
$ban_mode = $this->find_type($mode); $ban_mode = $this->find_type($mode);
@ -370,7 +372,15 @@ class manager
}); });
} }
public function get_ban_end(\phpbb\user $user, \DateTimeInterface $ban_start, $length, $end_date): \DateTimeInterface /**
* Get ban end
*
* @param \DateTimeInterface $ban_start
* @param int $length
* @param string $end_date
* @return \DateTimeInterface
*/
public function get_ban_end(\DateTimeInterface $ban_start, int $length, string $end_date): \DateTimeInterface
{ {
$current_time = $ban_start->getTimestamp(); $current_time = $ban_start->getTimestamp();
$end_time = 0; $end_time = 0;
@ -387,7 +397,7 @@ class manager
{ {
$end_time = max( $end_time = max(
$current_time, $current_time,
\DateTime::createFromFormat('Y-m-d', $end_date, $user->timezone)->getTimestamp() \DateTime::createFromFormat('Y-m-d', $end_date, $this->user->timezone)->getTimestamp()
); );
} }
else else
@ -403,16 +413,6 @@ class manager
return $ban_end; return $ban_end;
} }
/**
* Sets the current user to exclude from banning
*
* @param \phpbb\user $user An user object
*/
public function set_user(\phpbb\user $user)
{
$this->user = $user;
}
/** /**
* Cleans up the database of e.g. stale bans * Cleans up the database of e.g. stale bans
*/ */