Merge remote-tracking branch 'upstream/preprodparkur' into ofaj

chamilo · Oct 27, 2022 · 1e85277 · 1e85277
2 parents 656dedb + c480b97
commit 1e85277
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -128,7 +128,8 @@ public function registerBundles()
             /*new Bazinga\Bundle\FakerBundle\BazingaFakerBundle(),
             //new Chamilo\CmsBundle\ChamiloCmsBundle(),
              */
-            new Lunetics\LocaleBundle\LuneticsLocaleBundle()
+            new Lunetics\LocaleBundle\LuneticsLocaleBundle(),
+            new Gregwar\CaptchaBundle\GregwarCaptchaBundle()
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -283,7 +283,7 @@ knp_menu:
 #            client_id:           <client_id>
 #            client_secret:       <client_secret>
 
-#gregwar_captcha:
+gregwar_captcha: ~
 
 # Doctrine audit
 sonata_doctrine_orm_admin:

diff --git a/composer.json b/composer.json
@@ -156,7 +156,8 @@
         "symfony/dom-crawler": "~2.8",
         "brumann/polyfill-unserialize": "^1.0",
         "yuloh/bccomp-polyfill":  "dev-master",
-        "thenetworg/oauth2-azure": "^1.4"
+        "thenetworg/oauth2-azure": "^1.4",
+	    "gregwar/captcha-bundle": "2.0"
     },
     "require-dev": {
         "behat/behat": "@stable",

diff --git a/src/Chamilo/ContactBundle/Form/Type/ContactType.php b/src/Chamilo/ContactBundle/Form/Type/ContactType.php
@@ -3,6 +3,7 @@
 
 namespace Chamilo\ContactBundle\Form\Type;
 
+use Gregwar\CaptchaBundle\Type\CaptchaType;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -40,6 +41,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('message', 'textarea')
             // Ofaj
             ->add('gdpr_checkbox', CheckboxType::class, ['mapped' => false])
+            ->add('captcha', CaptchaType::class,
+                [
+                    'width' => 200,
+                    'height' => 50,
+                    'length' => 6
+                ])
             /*->add(
                 'gdpr_textarea',
                 'textarea',