makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 20:08:55 +00:00
Code Issues Projects Releases Packages 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>[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>[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>[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> </ul>
<a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3> <a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3>

15
phpBB/includes/acp/acp_inactive.php
View file

@ -53,7 +53,7 @@ class acp_inactive
if ($submit && sizeof($mark)) 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); trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
@ -123,6 +123,8 @@ class acp_inactive
} }
} }
else if ($action == 'delete') else if ($action == 'delete')
{
if (confirm_box(true))
{ {
if (!$auth->acl_get('a_userdel')) if (!$auth->acl_get('a_userdel'))
{ {
@ -134,6 +136,17 @@ class acp_inactive
user_delete('retain', $user_id, $user_affected[$user_id]); user_delete('retain', $user_id, $user_affected[$user_id]);
} }
} }
else
{
$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));
}
}
add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected)); add_log('admin', 'LOG_INACTIVE_' . strtoupper($action), implode(', ', $user_affected));