mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
* 3.1.x:
  [ticket/14241] Log fatal captcha error to error log
  [ticket/14241] Prevent empty q&a as a result of improper settings
This commit is contained in:
Tristan Darricau
2016-03-25 11:43:05 +01:00
parent 8d98981012 6774c5077d
commit e873ed6944
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
phpBB/phpbb/captcha/plugins/qa.php
View File

@@ -100,6 +100,28 @@ class qa
$db->sql_freeresult($result);
}
// final fallback to any language
if (!sizeof($this->question_ids))
{
$this->question_lang = '';
$sql = 'SELECT q.question_id, q.lang_iso
FROM ' . $this->table_captcha_questions . ' q, ' . $this->table_captcha_answers . ' a
WHERE q.question_id = a.question_id
GROUP BY lang_iso';
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
{
if (empty($this->question_lang))
{
$this->question_lang = $row['lang_iso'];
}
$this->question_ids[$row['question_id']] = $row['question_id'];
}
$db->sql_freeresult($result);
}
// okay, if there is a confirm_id, we try to load that confirm's state. If not, we try to find one
if (!$this->load_answer() && (!$this->load_confirm_id() || !$this->load_answer()))
{
@@ -198,10 +220,12 @@ class qa
*/
function get_template()
{
global $template;
global $phpbb_log, $template, $user;
if ($this->is_solved())
if ($this->is_solved() || empty($this->question_text) || !count($this->question_ids))
{
/** @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;
}
else
@@ -363,13 +387,15 @@ class qa
*/
function validate()
{
global $user;
global $phpbb_log, $user;
$error = '';
if (!sizeof($this->question_ids))
{
return false;
/** @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 $user->lang('CONFIRM_QUESTION_MISSING');
}
if (!$this->confirm_id)