makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11566] add captcha reset and hidden fields

Browse source 
If captcha is solved and some other error pops up, store the
captcha in a hidden field.
Reset captcha if reporting the post is successful

PHPBB3-11566
This commit is contained in:
Dhruv 2013-06-11 00:20:26 +05:30
parent 2c240f8a7b
commit c4fbed251d
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/report.php
View file

@ -141,6 +141,7 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'])
} }
$error = array(); $error = array();
$s_hidden_fields = '';
// Submit report? // Submit report?
if ($submit && $reason_id) if ($submit && $reason_id)
@ -165,6 +166,11 @@ if ($submit && $reason_id)
if (!sizeof($error)) if (!sizeof($error))
{ {
if (isset($captcha))
{
$captcha->reset();
}
$sql_ary = array( $sql_ary = array(
'reason_id' => (int) $reason_id, 'reason_id' => (int) $reason_id,
'post_id' => $post_id, 'post_id' => $post_id,
@ -235,6 +241,10 @@ if ($submit && $reason_id)
} }
trigger_error($message); trigger_error($message);
} }
else if (isset($captcha) && $captcha->is_solved() !== false)
{
$s_hidden_fields .= build_hidden_fields($captcha->get_hidden_fields());
}
} }
// Generate the reasons // Generate the reasons
@ -255,6 +265,7 @@ $template->assign_vars(array(
'S_REPORT_POST' => ($pm_id) ? false : true, 'S_REPORT_POST' => ($pm_id) ? false : true,
'REPORT_TEXT' => $report_text, 'REPORT_TEXT' => $report_text,
'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&p=' . $post_id . '&pm=' . $pm_id), 'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&p=' . $post_id . '&pm=' . $pm_id),
'S_HIDDEN_FIELDS' => (sizeof($s_hidden_fields)) ? $s_hidden_fields : null,
'S_NOTIFY' => $user_notify, 'S_NOTIFY' => $user_notify,
'S_CAN_NOTIFY' => ($user->data['is_registered']) ? true : false) 'S_CAN_NOTIFY' => ($user->data['is_registered']) ? true : false)