captcha as option + Fix bug in json response

Author: maxence d'Espeuilles

Entity/Webform.php

@@ -75,6 +75,13 @@ class Webform
      * @ORM\Column(name="use_ajax", type="boolean")
      */
     private $useAjax;
+    
+    /**
+     * @var bool
+     *
+     * @ORM\Column(name="use_captcha", type="boolean")
+     */
+    private $useCaptcha = 0;
 
     /**
      * @ORM\ManyToOne(targetEntity="Mdespeuilles\MailBundle\Entity\Email")
@@ -245,5 +252,19 @@ public function setSenderMail($senderMail)
     {
         $this->senderMail = $senderMail;
     }
+    
+    /**
+     * @return mixed
+     */
+    public function isUseCaptcha() {
+        return $this->useCaptcha;
+    }
+    
+    /**
+     * @param mixed $useCaptcha
+     */
+    public function setUseCaptcha($useCaptcha) {
+        $this->useCaptcha = $useCaptcha;
+    }
 }
 

Form/WebformType.php

@@ -47,11 +47,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             $builder->add($this::camelCase($component->getName()), $component->getType(), $componentOptions);
         }
 
-        $builder->add('recaptcha', EWZRecaptchaType::class, [
-            "required" => true,
-            "label" => false,
-            "mapped" => false
-        ]);
+        if ($webform->isUseCaptcha()) {
+            $builder->add('recaptcha', EWZRecaptchaType::class, [
+                "required" => true,
+                "label" => false,
+                "mapped" => false
+            ]);
+        }
 
         $builder->add('submit', SubmitType::class, [
             'label' => $webform->getSubmitString()

Resources/config/webform_admin.yml

@@ -25,6 +25,7 @@ easy_admin:
                     - { property: 'components', type: 'collection', type_options: { entry_type: 'Mdespeuilles\WebformBundle\Form\WebformComponentType', by_reference: false } }
                     - { type: 'group', css_class: 'col-sm-6', label: 'Paramètres avancés' }
                     - { property: 'useAjax', label: 'Utiliser ajax pour la soumission du formulaire' }
+                    - { property: 'useCaptcha', label: 'Utiliser un captcha pour le formulaire' }
                     - { type: 'group', css_class: 'col-sm-6', label: 'Paramètres emails' }
                     - { property: 'senderMail', label: 'Adresse email de l''expediteur' }
                     - { property: 'emailTemplate', label: 'Template', help: 'd''email à utiliser pour envoyer les resultats' }

Resources/public/js/oa.js Resources/public/js/webform.jsResources/public/js/oa.js renamed to Resources/public/js/webform.js

@@ -4,8 +4,7 @@ var ajax = function (url, data) {
     req.onreadystatechange = function (aEvt) {
         if (req.readyState == 4) {
             if (req.status == 200) {
-                console.log(req.response);
-                document.querySelector('.webform .response').innerHTML = req.response;
+                document.querySelector('.webform .response').innerHTML = JSON.parse(req.response);
             }
             else {
                 console.log(req.response);