Merge pull request #38 from bvrbanec/improvement/captcha-error-message

Add error to form if captcha validation fails

Author: MarioBlazek

bundle/InformationCollectionTrait.php

@@ -6,6 +6,7 @@
 use eZ\Publish\Core\MVC\Symfony\View\LocationValueView;
 use Netgen\Bundle\InformationCollectionBundle\Event\InformationCollected;
 use Netgen\Bundle\InformationCollectionBundle\Form\Captcha\CaptchaValueInterface;
+use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\Request;
 
 trait InformationCollectionTrait
@@ -38,12 +39,12 @@ protected function collectInformation(ContentValueView $view, Request $request)
             ->get('netgen_information_collection.factory.captcha')
             ->getCaptcha($view->getLocation());
 
-
         $form->handleRequest($request);
+        $validCaptcha = $captcha->isValid($request);
+        $formSubmitted = $form->isSubmitted();
 
-        if ($form->isValid() && $form->isSubmitted() && $captcha->isValid($request)) {
+        if ($formSubmitted && $form->isValid() && $validCaptcha) {
             $isValid = true;
-
             $event = new InformationCollected($form->getData());
 
             /** @var \Symfony\Component\EventDispatcher\EventDispatcherInterface $dispatcher */
@@ -53,6 +54,10 @@ protected function collectInformation(ContentValueView $view, Request $request)
             $dispatcher->dispatch(Events::INFORMATION_COLLECTED, $event);
         }
 
+        if (true === $formSubmitted && false === $validCaptcha) {
+            $form->addError(new FormError($this->container->get('translator')->trans('form.errors.captcha_failed', array(), 'netgen_information_collection_form_messages')));
+        }
+
         return array(
             'is_valid' => $isValid,
             'form' => $form->createView(),

bundle/Resources/translations/netgen_information_collection_form_messages.en.yml

@@ -0,0 +1 @@
+form.errors.captcha_failed: "Captcha validation failed"