Merge pull request phpbb#6905 from Neo-CTC/ticket/17589

marc1706 · web-flow · commit 44238eb11704 · 2025-12-10T20:17:05.000+01:00
[ticket/17589] Check confirm id for QA captcha
diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php
@@ -573,6 +573,7 @@ function check_answer()
 		global $db, $request;
 
 		$answer = ($this->question_strict) ? $request->variable('qa_answer', '', true) : utf8_clean_string($request->variable('qa_answer', '', true));
+		$confirm_id = $request->variable('qa_confirm_id', '');
 
 		$sql = 'SELECT answer_text
 			FROM ' . $this->table_captcha_answers . '
@@ -583,7 +584,7 @@ function check_answer()
 		{
 			$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']);
 
-			if ($solution === $answer)
+			if ($solution === $answer && $this->confirm_id === $confirm_id)
 			{
 				$this->solved = true;
 

Original file line number	Diff line number	Diff line change
`@@ -573,6 +573,7 @@ function check_answer()`
`573`	`573`	`global $db, $request;`
`574`	`574`
`575`	`575`	`$answer = ($this->question_strict) ? $request->variable('qa_answer', '', true) : utf8_clean_string($request->variable('qa_answer', '', true));`
	`576`	`+ $confirm_id = $request->variable('qa_confirm_id', '');`
`576`	`577`
`577`	`578`	`$sql = 'SELECT answer_text`
`578`	`579`	`FROM ' . $this->table_captcha_answers . '`
`@@ -583,7 +584,7 @@ function check_answer()`
`583`	`584`	`{`
`584`	`585`	`$solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']);`
`585`	`586`
`586`		`- if ($solution === $answer)`
	`587`	`+ if ($solution === $answer && $this->confirm_id === $confirm_id)`
`587`	`588`	`{`
`588`	`589`	`$this->solved = true;`
`589`	`590`