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

[ticket/16105] Use domain setting for recaptcha v2 as well

Browse source 
PHPBB3-16105
This commit is contained in:
Marc Alexander 2022-11-20 16:51:17 +01:00
parent c66923bafc
commit b828efa9e6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/captcha/plugins/recaptcha.php
View file

@ -15,18 +15,13 @@ namespace phpbb\captcha\plugins;
class recaptcha extends captcha_abstract class recaptcha extends captcha_abstract
{ {
var $recaptcha_server = 'http://www.recaptcha.net/recaptcha/api'; private $response;
var $recaptcha_server_secure = 'https://www.recaptcha.net/recaptcha/api'; // class constants :(
var $response;
/** /**
* Constructor * Constructor
*/ */
public function __construct() public function __construct()
{ {
global $request;
$this->recaptcha_server = $request->is_secure() ? $this->recaptcha_server_secure : $this->recaptcha_server;
} }
function init($type) function init($type)
@ -148,9 +143,10 @@ class recaptcha extends captcha_abstract
{ {
$contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx); $contact_link = phpbb_get_board_contact_link($config, $phpbb_root_path, $phpEx);
$explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>'); $explain = $user->lang(($this->type != CONFIRM_POST) ? 'CONFIRM_EXPLAIN' : 'POST_CONFIRM_EXPLAIN', '<a href="' . $contact_link . '">', '</a>');
$domain = $config['recaptcha_v2_domain'] ?? recaptcha_v3::GOOGLE;
$template->assign_vars(array( $template->assign_vars(array(
'RECAPTCHA_SERVER' => $this->recaptcha_server, 'RECAPTCHA_SERVER' => sprintf('//%1$s/recaptcha/api', $domain),
'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '', 'RECAPTCHA_PUBKEY' => isset($config['recaptcha_pubkey']) ? $config['recaptcha_pubkey'] : '',
'S_RECAPTCHA_AVAILABLE' => self::is_available(), 'S_RECAPTCHA_AVAILABLE' => self::is_available(),
'S_CONFIRM_CODE' => true, 'S_CONFIRM_CODE' => true,