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

[ticket/9687] Remove support for ban exclude

Browse Source 
PHPBB3-9687
This commit is contained in:
Marc Alexander
2023-07-29 16:41:43 +02:00
parent cf0e747d51
commit c88a9f0b01
8 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/acp/acp_ban.php
View File

@@ -76,7 +76,6 @@ class acp_ban
* @var string ban Either string or array with usernames, ips or email addresses
* @var int ban_length Ban length in minutes
* @var string ban_length_other Ban length as a date (YYYY-MM-DD)
* @var bool ban_exclude Are we banning or excluding from another ban
* @var string ban_reason Ban reason displayed to moderators
* @var string ban_give_reason Ban reason displayed to the banned user
* @var mixed abort_ban Either false, or an error message that is displayed to the user.
@@ -88,7 +87,6 @@ class acp_ban
'ban',
'ban_length',
'ban_length_other',
'ban_exclude',
'ban_reason',
'ban_give_reason',
'abort_ban',
@@ -115,7 +113,6 @@ class acp_ban
* @var string ban Either string or array with usernames, ips or email addresses
* @var int ban_length Ban length in minutes
* @var string ban_length_other Ban length as a date (YYYY-MM-DD)
* @var bool ban_exclude Are we banning or excluding from another ban
* @var string ban_reason Ban reason displayed to moderators
* @var string ban_give_reason Ban reason displayed to the banned user
* @since 3.1.0-RC5
@@ -125,7 +122,6 @@ class acp_ban
'ban',
'ban_length',
'ban_length_other',
'ban_exclude',
'ban_reason',
'ban_give_reason',
);
@@ -150,7 +146,6 @@ class acp_ban
$this->page_title = $language->lang(strtoupper($mode) . '_BAN');
$l_ban_explain = $language->lang(strtoupper($mode) . '_BAN_EXPLAIN');
$l_ban_exclude_explain = $language->lang(strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN');
$l_unban_title = $language->lang(strtoupper($mode) . '_UNBAN');
$l_unban_explain = $language->lang(strtoupper($mode) . '_UNBAN_EXPLAIN');
$l_no_ban_cell = $language->lang(strtoupper($mode) . '_NO_BANNED');
@@ -182,7 +177,6 @@ class acp_ban
'L_UNBAN_TITLE' => $l_unban_title,
'L_UNBAN_EXPLAIN' => $l_unban_explain,
'L_BAN_CELL' => $l_ban_cell,
'L_BAN_EXCLUDE_EXPLAIN' => $l_ban_exclude_explain,
'L_NO_BAN_CELL' => $l_no_ban_cell,
'S_USERNAME_BAN' => $mode == 'user',