webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-23 18:29:15 +03:00
Code Activity

Allow google/recaptcha 2.x

Browse Source 
Signed-off-by: Rowan Merewood <merewood@google.com>
This commit is contained in:
Rowan Merewood
2026-09-28 15:04:50 +01:00
parent 09b821d72b
commit 768edc6a21
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -58,7 +58,7 @@
"ext-xml": "*",
"composer/ca-bundle": "^1.2",
"fig/http-message-util": "^1.1",
"google/recaptcha": "^1.3",
"google/recaptcha": "^1.3 || ^2.0",
"laminas/laminas-httphandlerrunner": "^2.6",
"nikic/fast-route": "^1.3",
"phpmyadmin/motranslator": "^6.0",

2
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "c762e0ae0305378a0054facb42660b57",
"content-hash": "3be3d2a6ff15cc672bb05ebb2b444126",
"packages": [
{
"name": "composer/ca-bundle",

4
src/Plugins/Auth/AuthenticationCookie.php
View File

@@ -240,7 +240,7 @@ class AuthenticationCookie extends AuthenticationPlugin
if (function_exists('curl_init') && function_exists('curl_exec')) {
$reCaptcha = new ReCaptcha\ReCaptcha(
$config->config->CaptchaLoginPrivateKey,
new ReCaptcha\RequestMethod\CurlPost(null, $captchaSiteVerifyURL),
new ReCaptcha\RequestMethod\CurlPost(siteVerifyUrl: $captchaSiteVerifyURL),
);
} elseif (ini_get('allow_url_fopen')) {
$reCaptcha = new ReCaptcha\ReCaptcha(
@@ -250,7 +250,7 @@ class AuthenticationCookie extends AuthenticationPlugin
} else {
$reCaptcha = new ReCaptcha\ReCaptcha(
$config->config->CaptchaLoginPrivateKey,
new ReCaptcha\RequestMethod\SocketPost(null, $captchaSiteVerifyURL),
new ReCaptcha\RequestMethod\SocketPost(siteVerifyUrl: $captchaSiteVerifyURL),
);
}