Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Use build-in captcha only when session is avaiable

Browse Source 
[MAILPOET-2248]
This commit is contained in:
Rostislav Wolny
2019-08-05 08:55:54 +02:00
committed by Jack Kitterhing
parent 8e1c3b8c03
commit 881d068f8b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/JSON/v1/Subscribers.php
View File

@@ -167,7 +167,10 @@ class Subscribers extends APIEndpoint {
$captcha_settings = $this->settings->get('captcha'); $captcha_settings = $this->settings->get('captcha');
if (!empty($captcha_settings['type']) && $captcha_settings['type'] === Captcha::TYPE_BUILTIN) { if (!empty($captcha_settings['type'])
&& $captcha_settings['type'] === Captcha::TYPE_BUILTIN
&& $this->captcha_session->isAvailable()
) {
if (!isset($data['captcha'])) { if (!isset($data['captcha'])) {
// Save form data to session // Save form data to session
$this->captcha_session->setFormData(array_merge($data, ['form_id' => $form_id])); $this->captcha_session->setFormData(array_merge($data, ['form_id' => $form_id]));
@@ -226,7 +229,7 @@ class Subscribers extends APIEndpoint {
if ($errors !== false) { if ($errors !== false) {
return $this->badRequest($errors); return $this->badRequest($errors);
} else { } else {
if (!empty($captcha_settings['type']) && $captcha_settings['type'] === Captcha::TYPE_BUILTIN) { if (!empty($captcha_settings['type']) && $captcha_settings['type'] === Captcha::TYPE_BUILTIN && $this->captcha_session->isAvailable()) {
// Captcha has been verified, invalidate the session vars // Captcha has been verified, invalidate the session vars
$this->captcha_session->reset(); $this->captcha_session->reset();
} }
@@ -267,7 +270,7 @@ class Subscribers extends APIEndpoint {
} }
$is_builtin_captcha_required = false; $is_builtin_captcha_required = false;
if ($captcha_settings['type'] === Captcha::TYPE_BUILTIN) { if ($captcha_settings['type'] === Captcha::TYPE_BUILTIN && $this->captcha_session->isAvailable()) {
$is_builtin_captcha_required = $this->subscription_captcha->isRequired(isset($data['email']) ? $data['email'] : ''); $is_builtin_captcha_required = $this->subscription_captcha->isRequired(isset($data['email']) ? $data['email'] : '');
if ($is_builtin_captcha_required && empty($data['captcha'])) { if ($is_builtin_captcha_required && empty($data['captcha'])) {
$meta = []; $meta = [];