diff options
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rwxr-xr-x | phpBB/includes/acp/acp_inactive.php | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c8e7aa0074..a81aa9f694 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -114,7 +114,7 @@ <li>[Fix] Prevent topic unlocking if locked by someone else while posting (#10307)</li> <li>[Change] Allow years in future be selected for date custom profile field (#14519)</li> <li>[Fix] Don't display "Avatars Disabled" message on edit groups in UCP (#14636)</li> - + <li>[Change] Require confirm for deleting inactive users. </li> </ul> <a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3> diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index b440c5cbc3..73872c9b72 100755 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -53,7 +53,7 @@ class acp_inactive if ($submit && sizeof($mark)) { - if (!check_form_key($form_key)) + if ($action !== 'delete' && !check_form_key($form_key)) { trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } @@ -124,14 +124,27 @@ class acp_inactive } else if ($action == 'delete') { - if (!$auth->acl_get('a_userdel')) + if (confirm_box(true)) { - trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); - } + if (!$auth->acl_get('a_userdel')) + { + trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); + } - foreach ($mark as $user_id) + foreach ($mark as $user_id) + { + user_delete('retain', $user_id, $user_affected[$user_id]); + } + } + else { - user_delete('retain', $user_id, $user_affected[$user_id]); + $s_hidden_fields = array( + 'mode' => $mode, + 'action' => $action, + 'mark' => $mark, + 'submit' => 1, + ); + confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields)); } } |