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)
|
public function buildForm(FormBuilder $builder, array $options)
|
||||||
{
|
{
|
||||||
|
$this->key = $builder->getForm()->getName();
|
||||||
$builder->addValidator(
|
$builder->addValidator(
|
||||||
new CaptchaValidator($this->session, $this->key)
|
new CaptchaValidator($this->session, $this->key)
|
||||||
);
|
);
|
||||||
|
@ -148,16 +149,20 @@ class CaptchaType extends AbstractType
|
||||||
|
|
||||||
private function generateCaptchaValue()
|
private function generateCaptchaValue()
|
||||||
{
|
{
|
||||||
$charset = 'abcdefghijklmnopqrstuvwxyz0123456789';
|
if (!$this->session->has($this->key)) {
|
||||||
$value = '';
|
$value = '';
|
||||||
$chars = str_split($charset);
|
$charset = 'abcdefhjkmnprstuvwxyz23456789';
|
||||||
|
$chars = str_split($charset);
|
||||||
|
|
||||||
for ($i=0; $i<$this->length; $i++) {
|
for ($i=0; $i<$this->length; $i++) {
|
||||||
$value.= $chars[array_rand($chars)];
|
$value.= $chars[array_rand($chars)];
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->session->set($this->key, $value);
|
||||||
|
} else {
|
||||||
|
$value = $this->session->get($this->key);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->session->set($this->key, $value);
|
|
||||||
|
|
||||||
return $value;
|
return $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,9 +38,9 @@ class CaptchaValidator implements FormValidatorInterface
|
||||||
if (!($code && $excepted_code && is_string($code) && is_string($excepted_code)
|
if (!($code && $excepted_code && is_string($code) && is_string($excepted_code)
|
||||||
&& $this->niceize($code) == $this->niceize($excepted_code))) {
|
&& $this->niceize($code) == $this->niceize($excepted_code))) {
|
||||||
$form->addError(new FormError('Bad code value'));
|
$form->addError(new FormError('Bad code value'));
|
||||||
|
} else {
|
||||||
|
$this->session->remove($this->key);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->session->remove($this->key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue