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

[ticket/11566] add error functionality

Browse source 
add $error which stores the captcha error when captcha validation fails

PHPBB3-11566
This commit is contained in:
Dhruv 2013-06-10 23:52:41 +05:30
parent 7a2e3b4354
commit eafd0ae29f
1 changed files with 81 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/report.php
View file

@ -140,9 +140,19 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'])
$captcha->init(CONFIRM_POST); $captcha->init(CONFIRM_POST);
} }
$error = array();
// Submit report? // Submit report?
if ($submit && $reason_id) if ($submit && $reason_id)
{ {
$vc_response = $captcha->validate();
if ($vc_response)
{
$error[] = $vc_response;
}
if (!sizeof($error))
{
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . REPORTS_REASONS_TABLE . " FROM ' . REPORTS_REASONS_TABLE . "
WHERE reason_id = $reason_id"; WHERE reason_id = $reason_id";
@ -224,6 +234,7 @@ if ($submit && $reason_id)
$message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>'); $message .= '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $return_forum_url . '">', '</a>');
} }
trigger_error($message); trigger_error($message);
}
} }
// Generate the reasons // Generate the reasons
@ -231,14 +242,16 @@ display_reasons($reason_id);
$page_title = ($pm_id) ? $user->lang['REPORT_MESSAGE'] : $user->lang['REPORT_POST']; $page_title = ($pm_id) ? $user->lang['REPORT_MESSAGE'] : $user->lang['REPORT_POST'];
if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === false)) if ((isset($captcha) && $captcha->is_solved() === false))
{ {
$template->assign_vars(array( $template->assign_vars(array(
'S_CONFIRM_CODE' => true,
'CAPTCHA_TEMPLATE' => $captcha->get_template(), 'CAPTCHA_TEMPLATE' => $captcha->get_template(),
)); ));
} }
$template->assign_vars(array( $template->assign_vars(array(
'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '',
'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 . '&amp;p=' . $post_id . '&amp;pm=' . $pm_id), 'S_REPORT_ACTION' => append_sid("{$phpbb_root_path}report.$phpEx", 'f=' . $forum_id . '&amp;p=' . $post_id . '&amp;pm=' . $pm_id),