Merge branch 'master' of github.com:Gregwar/CaptchaBundle

Added English translation

DependencyInjection/Configuration.php

@@ -42,7 +42,9 @@ class Configuration implements ConfigurationInterface
                 ->scalarNode('max_front_lines')->defaultValue(null)->end()
                 ->scalarNode('max_behind_lines')->defaultValue(null)->end()
                 ->scalarNode('interpolation')->defaultValue(true)->end()
-                ->arrayNode('background_color')->prototype('scalar')->end()
+                ->arrayNode('text_color')->prototype('scalar')->end()->end()
+                ->arrayNode('background_color')->prototype('scalar')->end()->end()
+                ->scalarNode('disabled')->defaultValue(false)->end()
             ->end()
         ;
 

DependencyInjection/GregwarCaptchaExtension.php

@@ -33,10 +33,6 @@ class GregwarCaptchaExtension extends Extension
         $container->setParameter('gregwar_captcha.config.expiration', $config['expiration']);
         $container->setParameter('gregwar_captcha.config.whitelist_key', $config['whitelist_key']);
 
-        if ($config['reload'] && !$config['as_url']) {
-            throw new \InvalidArgumentException('GregwarCaptcha: The reload option cannot be set without as_url, see the README for more information');
-        }
-
         $resources = $container->getParameter('twig.form.resources');
         $container->setParameter('twig.form.resources', array_merge(array('GregwarCaptchaBundle::captcha.html.twig'), $resources));
     }

Generator/CaptchaGenerator.php

@@ -98,8 +98,17 @@ class CaptchaGenerator
         $this->builder->setMaxFrontLines($options['max_front_lines']);
         $this->builder->setMaxBehindLines($options['max_behind_lines']);
 
-        if ($options['background_color'] != array()) {
-            if (count($options['background_color'])!=3) {
+        if (isset($options['text_color']) && $options['text_color']) {
+            if (count($options['text_color']) !== 3) {
+                throw new \RuntimeException('text_color should be an array of r, g and b');
+            }
+
+            $color = $options['text_color'];
+            $this->builder->setTextColor($color[0], $color[1], $color[2]);
+        }
+
+        if (isset($options['background_color']) && $options['background_color']) {
+            if (count($options['background_color']) !== 3) {
                 throw new \RuntimeException('background_color should be an array of r, g and b');
             }
 

README.md

@@ -123,10 +123,12 @@ You can define the following configuration options globally or on the CaptchaTyp
 
 * **width**: the width of the captcha image (default=120)
 * **height**: the height of the captcha image (default=40)
+* **disabled**: disable globally the CAPTCHAs (can be useful in dev environment), it will
+  still appear but won't be editable and won't be checked
 * **length**: the length of the captcha (number of chars, default 5)
 * **quality**: jpeg quality of captchas (default=15)
 * **charset**: the charset used for code generation (default=abcdefhjkmnprstuvwxyz23456789)
-* **font**: the font to use (default=Generator/Font/captcha.ttf)
+* **font**: the font to use (default is random among some pre-provided fonts), this should be an absolute path
 * **keep_value**: the value will be the same until the form is posted, even if the page is refreshed (default=true)
 * **as_file**: if set to true an image file will be created instead of embedding to please IE6/7 (default=false)
 * **as_url**: if set to true, a URL will be used in the image tag and will handle captcha generation. This can be used in a multiple-server environment and support IE6/7 (default=false)

Resources/translations/gregwar_captcha.de.yml

@@ -0,0 +1 @@
+Renew: Erneuern

Resources/translations/gregwar_captcha.en.yml

@@ -0,0 +1 @@
+Renew: Renew

Resources/translations/gregwar_captcha.nl.yml

@@ -0,0 +1 @@
+Renew: Vernieuwen

Resources/translations/gregwar_captcha.pt_BR.yml

@@ -0,0 +1 @@
+Renew: Regerar

Resources/translations/gregwar_captcha.ru.yml

@@ -0,0 +1 @@
+Renew: Обновить

Resources/translations/validators.de.yml

@@ -0,0 +1 @@
+Bad code value: Code stimmt nicht überein

Resources/translations/validators.en.yml

@@ -0,0 +1 @@
+Bad code value: Code does not match

Resources/translations/validators.nl.yml

@@ -0,0 +1 @@
+Bad code value: Code komt niet overeen

Resources/translations/validators.pt_BR.yml

@@ -0,0 +1 @@
+Bad code value: Código de verificação inválido

Resources/translations/validators.ru.yml

@@ -0,0 +1 @@
+Bad code value: Неправильный код

Type/CaptchaType.php

@@ -90,6 +90,10 @@ class CaptchaType extends AbstractType
     {
         $isHuman = false;
 
+        if ($options['reload'] && !$options['as_url']) {
+            throw new \InvalidArgumentException('GregwarCaptcha: The reload option cannot be set without as_url, see the README for more information');
+        }
+
         if ($options['humanity'] > 0) {
             $humanityKey = $this->key.'_humanity';
             if ($this->session->get($humanityKey, 0) > 0) {

composer.json

@@ -18,7 +18,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "gregwar/captcha": "v1.0.7"
+        "gregwar/captcha": "v1.0.10"
     },
     "autoload": {
         "psr-0": {