tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2575 from dhensby/patch-2

Browse Source 
FIX #2496 `ConfirmedPasswordField` mismatch passwords saved
This commit is contained in:
Ingo Schommer 2013-10-23 02:29:42 -07:00
commit 3f479ad282
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
forms/ConfirmedPasswordField.php
View File

@ -243,8 +243,12 @@ class ConfirmedPasswordField extends FormField {
// If $data is a DataObject, don't use the value, since it's a hashed value
if ($data && $data instanceof DataObject) $value = '';
//store this for later
$oldValue = $this->value;
if(is_array($value)) {
if($value['_Password'] || (!$value['_Password'] && !$this->canBeEmpty)) {
//only set the value if it's valid!
if($this->validate(RequiredFields::create())) {
$this->value = $value['_Password'];
}
@ -258,11 +262,14 @@ class ConfirmedPasswordField extends FormField {
}
}
$this->children->fieldByName($this->getName() . '[_Password]')
->setValue($this->value);
//looking up field by name is expensive, so lets check it needs to change
if ($oldValue != $this->value) {
$this->children->fieldByName($this->getName() . '[_Password]')
->setValue($this->value);
$this->children->fieldByName($this->getName() . '[_ConfirmPassword]')
->setValue($this->value);
$this->children->fieldByName($this->getName() . '[_ConfirmPassword]')
->setValue($this->value);
}
return $this;
}
@ -351,7 +358,9 @@ class ConfirmedPasswordField extends FormField {
}
$limitRegex = '/^.' . $limit . '$/';
if(!empty($value) && !preg_match($limitRegex,$value)) {
$validator->validationError('Password', $errorMsg,
$validator->validationError(
$name,
$errorMsg,
"validation",
false
);
@ -361,7 +370,7 @@ class ConfirmedPasswordField extends FormField {
if($this->requireStrongPassword) {
if(!preg_match('/^(([a-zA-Z]+\d+)|(\d+[a-zA-Z]+))[a-zA-Z0-9]*$/',$value)) {
$validator->validationError(
'Password',
$name,
_t('Form.VALIDATIONSTRONGPASSWORD',
"Passwords must have at least one digit and one alphanumeric character"),
"validation",