diff --git a/imgboard.php b/imgboard.php
index c1dbb9d..8c5c86e 100644
--- a/imgboard.php
+++ b/imgboard.php
@@ -66,11 +66,11 @@ if (!defined('TINYIB_LOCALE') || TINYIB_LOCALE == '') {
$translator->register();
}
-if ((TINYIB_CAPTCHA === 'hcaptcha' || TINYIB_MANAGECAPTCHA === 'hcaptcha') && (TINYIB_HCAPTCHA_SITE == '' || TINYIB_HCAPTCHA_SECRET == '')) {
+if ((TINYIB_CAPTCHA === 'hcaptcha' || TINYIB_REPLYCAPTCHA === 'hcaptcha' || TINYIB_MANAGECAPTCHA === 'hcaptcha') && (TINYIB_HCAPTCHA_SITE == '' || TINYIB_HCAPTCHA_SECRET == '')) {
fancyDie(__('TINYIB_HCAPTCHA_SITE and TINYIB_HCAPTCHA_SECRET must be configured.'));
}
-if ((TINYIB_CAPTCHA === 'recaptcha' || TINYIB_MANAGECAPTCHA === 'recaptcha') && (TINYIB_RECAPTCHA_SITE == '' || TINYIB_RECAPTCHA_SECRET == '')) {
+if ((TINYIB_CAPTCHA === 'recaptcha' || TINYIB_REPLYCAPTCHA === 'recaptcha' || TINYIB_MANAGECAPTCHA === 'recaptcha') && (TINYIB_RECAPTCHA_SITE == '' || TINYIB_RECAPTCHA_SECRET == '')) {
fancyDie(__('TINYIB_RECAPTCHA_SITE and TINYIB_RECAPTCHA_SECRET must be configured.'));
}
@@ -269,11 +269,6 @@ if (!isset($_GET['delete']) && !isset($_GET['manage']) && (isset($_POST['name'])
fancyDie(__('Posting is currently disabled.
Please try again in a few moments.'));
}
- if (!$loggedin) {
- checkCAPTCHA(TINYIB_CAPTCHA);
- checkFlood();
- }
-
$staffpost = isStaffPost();
$capcode = '';
if (!$staffpost) {
@@ -282,6 +277,11 @@ if (!isset($_GET['delete']) && !isset($_GET['manage']) && (isset($_POST['name'])
$post = newPost(setParent());
+ if (!$loggedin) {
+ checkCAPTCHA($post['parent'] == TINYIB_NEWTHREAD ? TINYIB_CAPTCHA : TINYIB_REPLYCAPTCHA);
+ checkFlood();
+ }
+
if (!$loggedin) {
if ($post['parent'] == TINYIB_NEWTHREAD && TINYIB_DISALLOWTHREADS != '') {
fancyDie(TINYIB_DISALLOWTHREADS);
diff --git a/inc/defines.php b/inc/defines.php
index 9c0b96e..a280493 100644
--- a/inc/defines.php
+++ b/inc/defines.php
@@ -64,6 +64,9 @@ if (!defined('TINYIB_NOFILEOK')) {
if (!defined('TINYIB_CAPTCHA')) {
define('TINYIB_CAPTCHA', '');
}
+if (!defined('TINYIB_REPLYCAPTCHA')) {
+ define('TINYIB_REPLYCAPTCHA', TINYIB_CAPTCHA);
+}
if (!defined('TINYIB_REPORTCAPTCHA')) {
define('TINYIB_REPORTCAPTCHA', '');
}
diff --git a/inc/html.php b/inc/html.php
index a078c33..818b5a2 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -13,10 +13,10 @@ function pageHeader() {
}
$js_captcha = '';
- if (TINYIB_CAPTCHA === 'hcaptcha' || TINYIB_MANAGECAPTCHA === 'hcaptcha') {
+ if (TINYIB_CAPTCHA === 'hcaptcha' || TINYIB_REPLYCAPTCHA === 'hcaptcha' || TINYIB_MANAGECAPTCHA === 'hcaptcha') {
$js_captcha .= '';
}
- if (TINYIB_CAPTCHA === 'recaptcha' || TINYIB_MANAGECAPTCHA === 'recaptcha') {
+ if (TINYIB_CAPTCHA === 'recaptcha' || TINYIB_REPLYCAPTCHA === 'recaptcha' || TINYIB_MANAGECAPTCHA === 'recaptcha') {
$js_captcha .= '';
}
@@ -196,14 +196,16 @@ EOF;
$embed_input_html = '';
$unique_posts_html = '';
+ $captcha_setting = $parent == TINYIB_NEWTHREAD ? TINYIB_CAPTCHA : TINYIB_REPLYCAPTCHA;
+
$captcha_html = '';
- if (TINYIB_CAPTCHA && !$staff_post) {
- if (TINYIB_CAPTCHA === 'hcaptcha') {
+ if ($captcha_setting && !$staff_post) {
+ if ($captcha_setting === 'hcaptcha') {
$captcha_inner_html = '