Merge pull request #172 from cengizhancaliskan/master

Support of multiple instance
Merge pull request #187 from mandalor-development/master
2018-11-20 11:41:34 +01:00 · 2018-04-24 11:22:05 +02:00 · 2018-02-28 15:15:55 +01:00 · 2017-03-27 22:32:00 +03:00 · 2017-03-19 18:40:34 +03:00
3 changed files with 7 additions and 4 deletions
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@ -47,6 +47,7 @@ class Configuration implements ConfigurationInterface
                ->arrayNode('background_images')->prototype('scalar')->end()->end()
                ->scalarNode('disabled')->defaultValue(false)->end()
                ->scalarNode('ignore_all_effects')->defaultValue(false)->end()
+                ->scalarNode('session_key')->defaultValue('captcha')->end()
            ->end()
        ;

--- a/DependencyInjection/GregwarCaptchaExtension.php
+++ b/DependencyInjection/GregwarCaptchaExtension.php
@ -34,6 +34,6 @@ class GregwarCaptchaExtension extends Extension
        $container->setParameter('gregwar_captcha.config.whitelist_key', $config['whitelist_key']);

        $resources = $container->getParameter('twig.form.resources');
-        $container->setParameter('twig.form.resources', array_merge(array('GregwarCaptchaBundle::captcha.html.twig'), $resources));
+        $container->setParameter('twig.form.resources', array_merge(array('@GregwarCaptcha/captcha.html.twig'), $resources));
    }
 }
--- a/Type/CaptchaType.php
+++ b/Type/CaptchaType.php
@ -22,6 +22,8 @@ use Gregwar\CaptchaBundle\Generator\CaptchaGenerator;
 */
 class CaptchaType extends AbstractType
 {
+    const SESSION_KEY_PREFIX = '_captcha_';
+
    /**
     * @var SessionInterface
     */
@ -53,7 +55,7 @@ class CaptchaType extends AbstractType
    {
        $this->session      = $session;
        $this->generator    = $generator;
-        $this->translator = $translator;
+        $this->translator   = $translator;
        $this->options      = $options;
    }

@ -65,7 +67,7 @@ class CaptchaType extends AbstractType
        $validator = new CaptchaValidator(
            $this->translator,
            $this->session,
-            sprintf('gcb_%s', $builder->getForm()->getName()),
+            sprintf('%s%s', self::SESSION_KEY_PREFIX, $options['session_key']),
            $options['invalid_message'],
            $options['bypass_code'],
            $options['humanity']
@ -83,7 +85,7 @@ class CaptchaType extends AbstractType
            throw new \InvalidArgumentException('GregwarCaptcha: The reload option cannot be set without as_url, see the README for more information');
        }

-        $sessionKey = sprintf('gcb_%s', $form->getName());
+        $sessionKey = sprintf('%s%s', self::SESSION_KEY_PREFIX, $options['session_key']);
        $isHuman    = false;

        if ($options['humanity'] > 0) {
Author	SHA1	Message	Date
Grégoire Passault	c2d5468556	Merge pull request #172 from cengizhancaliskan/master Support of multiple instance	2018-11-20 11:41:34 +01:00
Grégoire Passault	980afdc10a	Merge pull request #187 from mandalor-development/master Changed template reference	2018-04-24 11:22:05 +02:00
Mandalor-Development	791128c0fd	Changed template reference According to: https://symfony.com/doc/current/templating.html#referencing-templates-in-a-bundle Fixed error: [critical] Uncaught PHP Exception Twig_Error_Loader: "Unable to find template "GregwarCaptchaBundle::captcha.html.twig" (looked into: /[path]/templates, /[path]/templates, /[path]/vendor/symfony/twig-bridge/Resources/views/Form)." at /[path]/templates/form.html.twig line 17	2018-02-28 15:15:55 +01:00
Cengizhan Çalışkan	ba9c0e6166	Change session key for as_url option	2017-03-27 22:32:00 +03:00
Cengizhan Çalışkan	25b8840f2a	Support of multiple instance	2017-03-19 18:40:34 +03:00