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

[ticket/9687] Fix bugs when banning and add TODO's

Browse source 
PHPBB3-9687
This commit is contained in:
Oliver Schramm 2018-09-30 04:13:12 +02:00 • committed by Marc Alexander
parent 728b200cd9
commit 64ab1fc24c
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,6 @@ services:
- '@dbal.conn' - '@dbal.conn'
- '@log' - '@log'
- '@user' - '@user'
- '%tables.users' - '%tables.users%'
tags: tags:
- { name: ban.type } - { name: ban.type }

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

@ -180,9 +180,10 @@ class manager
} }
} }
// TODO: Prevent logging out founders
$sql = 'SELECT user_id $sql = 'SELECT user_id
FROM ' . $this->users_table . ' FROM ' . $this->users_table . '
WHERE ' . $this->db->sql_in_set('u.' . $user_column, $ban_items_sql) . $ban_or_like; WHERE ' . $this->db->sql_in_set('u.' . $user_column, $ban_items_sql, false, true) . $ban_or_like;
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$user_ids = []; $user_ids = [];

4
phpBB/phpbb/ban/type/email.php
View file

@ -60,13 +60,13 @@ class email extends base
{ {
throw new runtime_exception(); // TODO throw new runtime_exception(); // TODO
} }
$regex = '#^.*?@*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i'; $regex = '#^.*?@.*|(([a-z0-9\-]+\.)+([a-z]{2,3}))$#i';
$ban_items = []; $ban_items = [];
foreach ($items as $item) foreach ($items as $item)
{ {
$item = trim($item); $item = trim($item);
if (strlen($item) > 100 || preg_match($regex, $item) || in_array($item, $this->excluded)) if (strlen($item) > 100 || !preg_match($regex, $item) || in_array($item, $this->excluded))
{ {
continue; continue;
} }

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

@ -166,7 +166,7 @@ class user extends base
$sql_usernames = []; $sql_usernames = [];
$sql_or_like = []; $sql_or_like = [];
foreach ($items as $item) foreach ($items as $item) // TODO: Prevent banning Anonymous
{ {
$cleaned_username = utf8_clean_string($item); $cleaned_username = utf8_clean_string($item);
if (stripos($cleaned_username, '*') === false) if (stripos($cleaned_username, '*') === false)