Merge branch 'release/8.3.1'

Author: einpraegsam

Classes/Domain/Validator/CaptchaValidator.php

@@ -53,8 +53,16 @@ public function isValid($mail)
                 /** @var Answer $answer */
                 if ($answer->getField()->getType() === 'captcha') {
                     $this->setCaptchaArgument(true);
-                    if (!$this->validCodePreflight($answer->getValue(), $answer->getField())) {
-                        $this->setErrorAndMessage($answer->getField(), 'captcha');
+                    /* If the answer has a UID it has already been validated an persisted.
+                     * There's no reason to validate it twice. Also, there's no possibility, since the value to check
+                     * against got removed from the user's session on the first validation.
+                     * Resolves: https://github.com/einpraegsam/powermail/issues/376
+                     * Resolves: https://projekte.in2code.de/issues/44174
+                     */
+                    if ($answer->getUid() === null) {
+                        if (!$this->validCodePreflight($answer->getValue(), $answer->getField())) {
+                            $this->setErrorAndMessage($answer->getField(), 'captcha');
+                        }
                     }
                 }
             }

Documentation/Changelog/Readme.md

@@ -4,6 +4,7 @@
 
 | Version     | Release Date | Description                                                                                                           |
 |------------ |--------------|-----------------------------------------------------------------------------------------------------------------------|
+| 8.3.1       | 2021-03-08   | Bugfix: Don't validate captcha fields of already persisted mails (in double optin)                                    |
 | 8.3.0       | 2021-02-16   | Feature: Add autodeployment functionality to TER                                                                      |
 |             |              | Bugfix: Foreign-Validator compatibility to core methods                                                               |
 |             |              | Bugfix: Reanimate sending emails to backend users                                                                     |

ext_emconf.php

@@ -9,7 +9,7 @@
         and easy to use mailform extension with a lots of features
         (spam prevention, marketing information, optin, ajax submit, diagram analysis, etc...)',
     'category' => 'plugin',
-    'version' => '8.3.0',
+    'version' => '8.3.1',
     'state' => 'stable',
     'author' => 'Powermail Development Team',
     'author_email' => 'alexander.kellner@in2code.de',