mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-16 05:54:44 +01:00
Code Issues Releases Wiki Activity

And one more confirm box.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8149 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2007-10-05 16:22:14 +00:00
parent 82abcbf856
commit 9a8ff8563e
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View File

@ -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>

25
phpBB/includes/acp/acp_inactive.php
View File

@ -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));
}
}