Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-10-13 18:04:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor Google ReCaptcha code (#325)

Browse Source 
Removed duplicated code (store it in function/general.php)

Captcha doesn't need cURL (made it configurable and optional)
This commit is contained in:
slawkens
2018-06-04 12:41:49 +02:00
committed by Stefan A. Brannfjell
parent b6f30e63fc
commit 0478566020
5 changed files with 36 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
helpdesk.php
View File

@@ -108,27 +108,8 @@ if ($view !== false) {
$errors[] = 'Token is invalid.';
}
if ($config['use_captcha']) {
$captcha = (isset($_POST['g-recaptcha-response'])) ? $_POST['g-recaptcha-response'] : false;
if(!$captcha) {
$errors[] = 'Please check the the captcha form.';
} else {
$secretKey = $config['captcha_secret_key'];
$ip = $_SERVER['REMOTE_ADDR'];
// curl start
$curl_connection = curl_init("https://www.google.com/recaptcha/api/siteverify");
$post_string = "secret=".$secretKey."&response=".$captcha."&remoteip=".$ip;
curl_setopt($curl_connection, CURLOPT_CONNECTTIMEOUT, 5);
curl_setopt($curl_connection, CURLOPT_RETURNTRANSFER, true);
curl_setopt($curl_connection, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($curl_connection, CURLOPT_FOLLOWLOCATION, 0);
curl_setopt($curl_connection, CURLOPT_POSTFIELDS, $post_string);
$response = curl_exec($curl_connection);
curl_close($curl_connection);
// Curl end
$responseKeys = json_decode($response,true);
if(intval($responseKeys["success"]) !== 1) {
$errors[] = 'Captcha failed.';
}
if(!verifyGoogleReCaptcha($_POST['g-recaptcha-response'])) {
$errors[] = "Please confirm that you're not a robot.";
}
}
// Reversed this if, so: first check if you need to validate, then validate.