Merge pull request #6 from wowo/keeping_captcha_for_refreshes
Added ability to store captcha value in session between page redirects
This commit is contained in:
commit
5084b61fd9
|
@ -94,6 +94,7 @@ class CaptchaType extends AbstractType
|
|||
|
||||
public function buildForm(FormBuilder $builder, array $options)
|
||||
{
|
||||
$this->key = $builder->getForm()->getName();
|
||||
$builder->addValidator(
|
||||
new CaptchaValidator($this->session, $this->key)
|
||||
);
|
||||
|
@ -148,8 +149,9 @@ class CaptchaType extends AbstractType
|
|||
|
||||
private function generateCaptchaValue()
|
||||
{
|
||||
$charset = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
||||
if (!$this->session->has($this->key)) {
|
||||
$value = '';
|
||||
$charset = 'abcdefhjkmnprstuvwxyz23456789';
|
||||
$chars = str_split($charset);
|
||||
|
||||
for ($i=0; $i<$this->length; $i++) {
|
||||
|
@ -157,6 +159,9 @@ class CaptchaType extends AbstractType
|
|||
}
|
||||
|
||||
$this->session->set($this->key, $value);
|
||||
} else {
|
||||
$value = $this->session->get($this->key);
|
||||
}
|
||||
|
||||
return $value;
|
||||
}
|
||||
|
|
|
@ -38,10 +38,10 @@ class CaptchaValidator implements FormValidatorInterface
|
|||
if (!($code && $excepted_code && is_string($code) && is_string($excepted_code)
|
||||
&& $this->niceize($code) == $this->niceize($excepted_code))) {
|
||||
$form->addError(new FormError('Bad code value'));
|
||||
}
|
||||
|
||||
} else {
|
||||
$this->session->remove($this->key);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieve the excepted CAPTCHA code
|
||||
|
|
Loading…
Reference in New Issue