diff options
| author | Richard McGirr <rmcgirr83@gmail.com> | 2016-05-09 17:00:16 -0400 |
|---|---|---|
| committer | Richard McGirr <rmcgirr83@gmail.com> | 2016-05-09 17:28:55 -0400 |
| commit | 03348087d8bf8794da257f6e7ac4e318dd562fc0 (patch) | |
| tree | 58ab02665b8f01efaf921a5a99775afd40c94e19 /phpBB | |
| parent | f57f09f814f7faadf232625e2185a12fe0e503c6 (diff) | |
| download | forums-03348087d8bf8794da257f6e7ac4e318dd562fc0.tar forums-03348087d8bf8794da257f6e7ac4e318dd562fc0.tar.gz forums-03348087d8bf8794da257f6e7ac4e318dd562fc0.tar.bz2 forums-03348087d8bf8794da257f6e7ac4e318dd562fc0.tar.xz forums-03348087d8bf8794da257f6e7ac4e318dd562fc0.zip | |
[ticket/14610] Implement lavigor method
PHPBB3-14610
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/captcha/plugins/qa.php | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 7dc3ef796f..a9d133d8f2 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -222,13 +222,12 @@ class qa { 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 */ $phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_CAPTCHA', time(), array($user->lang('CONFIRM_QUESTION_MISSING'))); return false; @@ -236,10 +235,10 @@ class qa else { $template->assign_vars(array( - 'QA_CONFIRM_QUESTION' => $this->question_text, - 'QA_CONFIRM_ID' => $this->confirm_id, - 'S_CONFIRM_CODE' => true, - 'S_TYPE' => $this->type, + 'QA_CONFIRM_QUESTION' => $this->question_text, + 'QA_CONFIRM_ID' => $this->confirm_id, + 'S_CONFIRM_CODE' => true, + 'S_TYPE' => $this->type, )); return 'captcha_qa.html'; |