Merge pull request mautic#12621 from kuzmany/fix-form_autofil_email_f…

…ield_issue_if_email_contains_a Fix form autofill email field issue if email contains a +
lenonleite · Jan 31, 2024 · 8f32d14 · 8f32d14
2 parents 7aeca7d + 2c9ba96
commit 8f32d14
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/app/bundles/FormBundle/Helper/FormFieldHelper.php b/app/bundles/FormBundle/Helper/FormFieldHelper.php
@@ -247,7 +247,7 @@ public function populateField($field, $value, $formName, &$formHtml): void
     public function sanitizeValue($value)
     {
         $valueType = gettype($value);
-        $value     = str_replace(['"', '>', '<'], ['&quot;', '&gt;', '&lt;'], strip_tags(urldecode($value)));
+        $value     = str_replace(['"', '>', '<'], ['&quot;', '&gt;', '&lt;'], strip_tags(rawurldecode($value)));
         // for boolean expect 0 or 1
         if ('boolean' === $valueType) {
             return (int) $value;

diff --git a/app/bundles/FormBundle/Tests/Model/FormModelTest.php b/app/bundles/FormBundle/Tests/Model/FormModelTest.php
@@ -648,6 +648,35 @@ public function testPopulateValuesWithLead(): void
         $this->formModel->populateValuesWithLead($form, $formHtml);
     }
 
+    public function testPopulateValuesWithLeadWithSuffixEMail(): void
+    {
+        $formHtml   = '<html>';
+        $form       = new Form();
+        $emailField = new Field();
+        $contact    = new Lead();
+
+        $emailField->setMappedField('email');
+        $emailField->setMappedObject('contact');
+        $emailField->setIsAutoFill(true);
+        $form->addField(123, $emailField);
+
+        $contactCompanyData = [
+            'email' => '[email protected]',
+        ];
+
+        $this->contactTracker->method('getContact')
+            ->willReturn($contact);
+
+        $this->primaryCompanyHelper->method('getProfileFieldsWithPrimaryCompany')
+            ->willReturn($contactCompanyData);
+
+        $this->fieldHelper->expects($this->once())
+            ->method('populateField')
+            ->with($emailField, '[email protected]', 'form-', $formHtml);
+
+        $this->formModel->populateValuesWithLead($form, $formHtml);
+    }
+
     public function testPopulateValuesWithCompany(): void
     {
         $formHtml    = '<html>';