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

[ticket/9687] Clean up ACP module

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

49
phpBB/includes/acp/acp_ban.php
View file

@ -14,6 +14,11 @@
/** /**
* @ignore * @ignore
*/ */
use phpbb\ban\exception\type_not_found_exception;
use phpbb\ban\manager;
use phpbb\language\language;
if (!defined('IN_PHPBB')) if (!defined('IN_PHPBB'))
{ {
exit; exit;
@ -25,10 +30,10 @@ class acp_ban
function main($id, $mode) function main($id, $mode)
{ {
global $user, $template, $request, $phpbb_dispatcher, $phpbb_container; global $language, $template, $request, $phpbb_dispatcher, $phpbb_container;
global $phpbb_root_path, $phpEx; global $phpbb_root_path, $phpEx;
/** @var \phpbb\ban\manager $ban_manager */ /** @var manager $ban_manager */
$ban_manager = $phpbb_container->get('ban.manager'); $ban_manager = $phpbb_container->get('ban.manager');
if (!function_exists('user_ban')) if (!function_exists('user_ban'))
@ -39,14 +44,15 @@ class acp_ban
$bansubmit = $request->is_set_post('bansubmit'); $bansubmit = $request->is_set_post('bansubmit');
$unbansubmit = $request->is_set_post('unbansubmit'); $unbansubmit = $request->is_set_post('unbansubmit');
$user->add_lang(array('acp/ban', 'acp/users')); /** @var language $language */
$language->add_lang(['acp/ban', 'acp/users']);
$this->tpl_name = 'acp_ban'; $this->tpl_name = 'acp_ban';
$form_key = 'acp_ban'; $form_key = 'acp_ban';
add_form_key($form_key); add_form_key($form_key);
if (($bansubmit || $unbansubmit) && !check_form_key($form_key)) if (($bansubmit || $unbansubmit) && !check_form_key($form_key))
{ {
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($language->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING);
} }
// Ban submitted? // Ban submitted?
@ -96,13 +102,11 @@ class acp_ban
$ban_start = new \DateTime(); $ban_start = new \DateTime();
$ban_start->setTimestamp(time()); $ban_start->setTimestamp(time());
$ban_end = $ban_manager->get_ban_end($user, $ban_start, $ban_length, $ban_length_other); $ban_end = $ban_manager->get_ban_end($ban_start, $ban_length, $ban_length_other);
$ban = explode("\n", $ban); $ban = explode("\n", $ban);
$ban_manager->ban($mode, $ban, $ban_start, $ban_end, $ban_reason, $ban_give_reason); $ban_manager->ban($mode, $ban, $ban_start, $ban_end, $ban_reason, $ban_give_reason);
//user_ban($mode, $ban, $ban_length, $ban_length_other, $ban_exclude, $ban_reason, $ban_give_reason);
/** /**
* Use this event to perform actions after the ban has been performed * Use this event to perform actions after the ban has been performed
* *
@ -127,43 +131,46 @@ class acp_ban
); );
extract($phpbb_dispatcher->trigger_event('core.acp_ban_after', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.acp_ban_after', compact($vars)));
trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action)); trigger_error($language->lang('BAN_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action));
} }
} }
else if ($unbansubmit) else if ($unbansubmit)
{ {
$ban = $request->variable('unban', array('')); $ban = $request->variable('unban', []);
if ($ban) if ($ban)
{ {
user_unban($mode, $ban); $ban_manager->unban($mode, $ban);
trigger_error($user->lang['BAN_UPDATE_SUCCESSFUL'] . adm_back_link($this->u_action)); trigger_error($language->lang('BAN_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action));
} }
} }
// Define language vars // Define language vars
$this->page_title = $user->lang[strtoupper($mode) . '_BAN']; $this->page_title = $language->lang(strtoupper($mode) . '_BAN');
$l_ban_explain = $user->lang[strtoupper($mode) . '_BAN_EXPLAIN']; $l_ban_explain = $language->lang(strtoupper($mode) . '_BAN_EXPLAIN');
$l_ban_exclude_explain = $user->lang[strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN']; $l_ban_exclude_explain = $language->lang(strtoupper($mode) . '_BAN_EXCLUDE_EXPLAIN');
$l_unban_title = $user->lang[strtoupper($mode) . '_UNBAN']; $l_unban_title = $language->lang(strtoupper($mode) . '_UNBAN');
$l_unban_explain = $user->lang[strtoupper($mode) . '_UNBAN_EXPLAIN']; $l_unban_explain = $language->lang(strtoupper($mode) . '_UNBAN_EXPLAIN');
$l_no_ban_cell = $user->lang[strtoupper($mode) . '_NO_BANNED']; $l_no_ban_cell = $language->lang(strtoupper($mode) . '_NO_BANNED');
switch ($mode) switch ($mode)
{ {
case 'user': case 'user':
$l_ban_cell = $user->lang['USERNAME']; $l_ban_cell = $language->lang('USERNAME');
break; break;
case 'ip': case 'ip':
$l_ban_cell = $user->lang['IP_HOSTNAME']; $l_ban_cell = $language->lang('IP_HOSTNAME');
break; break;
case 'email': case 'email':
$l_ban_cell = $user->lang['EMAIL_ADDRESS']; $l_ban_cell = $language->lang('EMAIL_ADDRESS');
break; break;
default:
throw new type_not_found_exception();
} }
display_ban_end_options(); display_ban_end_options();
@ -178,7 +185,7 @@ class acp_ban
'L_BAN_EXCLUDE_EXPLAIN' => $l_ban_exclude_explain, 'L_BAN_EXCLUDE_EXPLAIN' => $l_ban_exclude_explain,
'L_NO_BAN_CELL' => $l_no_ban_cell, 'L_NO_BAN_CELL' => $l_no_ban_cell,
'S_USERNAME_BAN' => ($mode == 'user') ? true : false, 'S_USERNAME_BAN' => $mode == 'user',
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_ban&field=ban'), 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=acp_ban&field=ban'),