[ticket/14610] Implement lavigor method

PHPBB3-14610
This commit is contained in:
Richard McGirr 2016-05-09 17:00:16 -04:00
parent f57f09f814
commit 03348087d8

View file

@ -222,13 +222,12 @@ class qa
{ {
global $phpbb_log, $template, $user; global $phpbb_log, $template, $user;
if ($this->is_solved() || empty($this->question_text) || !count($this->question_ids)) if ($this->is_solved())
{
return false;
}
else if (empty($this->question_text) || !count($this->question_ids))
{ {
// don't log an error if the captcha has been solved
if ($this->is_solved())
{
return;
}
/** @var \phpbb\log\log_interface $phpbb_log */ /** @var \phpbb\log\log_interface $phpbb_log */
$phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_CAPTCHA', time(), array($user->lang('CONFIRM_QUESTION_MISSING'))); $phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_CAPTCHA', time(), array($user->lang('CONFIRM_QUESTION_MISSING')));
return false; return false;
@ -236,10 +235,10 @@ class qa
else else
{ {
$template->assign_vars(array( $template->assign_vars(array(
'QA_CONFIRM_QUESTION' => $this->question_text, 'QA_CONFIRM_QUESTION' => $this->question_text,
'QA_CONFIRM_ID' => $this->confirm_id, 'QA_CONFIRM_ID' => $this->confirm_id,
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,
'S_TYPE' => $this->type, 'S_TYPE' => $this->type,
)); ));
return 'captcha_qa.html'; return 'captcha_qa.html';