Captcha improvements (#229)

* Captcha improvements

* Update CHANGELOG.md

CHANGELOG.md

@@ -6,6 +6,7 @@
 **Merged pull requests:**
 
 - Release v2.1.5-2023.08 🎉
+- Captcha improvements [\#229](https://github.com/torrentpier/torrentpier-lts/pull/229) ([belomaxorka](https://github.com/belomaxorka))
 - Show renamed topic actions in log actions [\#227](https://github.com/torrentpier/torrentpier-lts/pull/227) ([belomaxorka](https://github.com/belomaxorka))
 - Show set/unset downloaded actions in log actions [\#226](https://github.com/torrentpier/torrentpier-lts/pull/226) ([belomaxorka](https://github.com/belomaxorka))
 - Show pin & unpin actions in log actions [\#225](https://github.com/torrentpier/torrentpier-lts/pull/225) ([belomaxorka](https://github.com/belomaxorka))

library/includes/functions.php

@@ -2815,14 +2815,18 @@ function hash_search ($hash)
 
 function bb_captcha ($mode, $callback = '')
 {
-	global $bb_cfg, $userdata;
+	global $bb_cfg, $lang;
 
 	require_once(CLASS_DIR .'recaptcha.php');
 
 	$secret = $bb_cfg['captcha']['secret_key'];
 	$public = $bb_cfg['captcha']['public_key'];
 	$theme  = $bb_cfg['captcha']['theme'];
-	$lang   = $bb_cfg['lang'][$userdata['user_lang']]['captcha'];
+
+	if (!$public && !$secret)
+	{
+		bb_die($lang['CAPTCHA_SETTINGS']);
+	}
 
 	$reCaptcha = new ReCaptcha($secret);
 
@@ -2840,7 +2844,7 @@ function bb_captcha ($mode, $callback = '')
 					};
 				</script>
 				<div id=\"tp-captcha\"></div>
-				<script src=\"https://www.google.com/recaptcha/api.js?onload=onloadCallback&hl=" . $lang . "&render=explicit\" async defer></script>";
+				<script src=\"https://www.google.com/recaptcha/api.js?onload=onloadCallback&render=explicit\" async defer></script>";
 			break;
 
 		case 'check':

library/language/en/main.php

@@ -2803,3 +2803,4 @@ $lang['UPLOAD_ERRORS'] = array(
 // Captcha
 $lang['CAPTCHA'] = 'Check that you are not a robot';
 $lang['CAPTCHA_WRONG'] = 'You could not confirm that you are not a robot';
+$lang['CAPTCHA_SETTINGS'] = '<h2>ReCaptcha not being fully configured</h2><p>If you haven\'t already generated the keys, you can do it on <a href="https://www.google.com/recaptcha/admin">https://www.google.com/recaptcha/admin</a>.<br />After you generate the keys, you need to put them at the file library/config.php.</p>';

library/language/ru/main.php

@@ -2803,3 +2803,4 @@ $lang['UPLOAD_ERRORS'] = array(
 // Captcha
 $lang['CAPTCHA'] = 'Проверка, что вы не робот';
 $lang['CAPTCHA_WRONG'] = 'Вы не смогли подтвердить, что вы не робот';
+$lang['CAPTCHA_SETTINGS'] = '<h2>ReCaptcha настроена не полностью</h2><p>Если вы еще не сгенерировали ключи, вы можете это сделать на странице <a href="https://www.google.com/recaptcha/admin">https://www.google.com/recaptcha/admin</a>.<br />После того, как вы сгенерируете ключи, нужно прописать их в файл library/config.php.</p>';

library/language/uk/main.php

@@ -2803,3 +2803,4 @@ $lang['UPLOAD_ERRORS'] = array(
 // Captcha
 $lang['CAPTCHA'] = 'Перевірка, що ви не робот';
 $lang['CAPTCHA_WRONG'] = 'Ви не змогли підтвердити, що ви не робот';
+$lang['CAPTCHA_SETTINGS'] = '<h2>ReCaptcha налаштована не повністю</h2><p>Якщо ви ще не згенерували ключі, ви можете це зробити на сторінці <a href="https://www.google.com/recaptcha/admin">https://www.google.com/recaptcha/admin</a>.<br />Після того, як ви сгенеріруете ключі, потрібно прописати їх у файл library/config.php.</p>';