From 9a8ff8563e9b23884806b72a6603800ac12e1411 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 5 Oct 2007 16:22:14 +0000
Subject: [PATCH] And one more confirm box.

git-svn-id: file:///svn/phpbb/trunk@8149 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/docs/CHANGELOG.html           |  2 +-
 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 &quot;Avatars Disabled&quot; 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));
 						}
 					}