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

Merged revisions 50200 via svnmerge from

Browse Source 
http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2

........
  r50200 | sminnee | 2008-02-26 14:42:29 +1300 (Tue, 26 Feb 2008) | 1 line
  
  Fixed password emailing for edited members
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50864 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-03-11 01:30:29 +00:00
parent 1dd8c7f07c
commit d7196a438c
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
security/Member.php
View File

@ -421,16 +421,7 @@ class Member extends DataObject {
* found update this record to merge with that member. * found update this record to merge with that member.
*/ */
function onBeforeWrite() { function onBeforeWrite() {
if(isset($this->changed['Password']) && $this->changed['Password']) { if($this->SetPassword) $this->Password = $this->SetPassword;
// Password was changed: encrypt the password according the settings
$encryption_details = Security::encrypt_password($this->Password);
$this->Password = $encryption_details['password'];
$this->Salt = $encryption_details['salt'];
$this->PasswordEncryption = $encryption_details['algorithm'];
$this->changed['Salt'] = true;
$this->changed['PasswordEncryption'] = true;
}
if($this->Email) { if($this->Email) {
if($this->ID) { if($this->ID) {
@ -458,12 +449,21 @@ class Member extends DataObject {
} }
} }
if($this->SetPassword) $this->Password = $this->SetPassword;
if(Director::isLive() && if(Director::isLive() &&
$this->changed['Password'] && $this->record['Password'] && $this->changed['Password'] && $this->record['Password'] &&
Member::$notify_password_change) $this->sendInfo('changePassword'); Member::$notify_password_change) $this->sendInfo('changePassword');
if(isset($this->changed['Password']) && $this->changed['Password']) {
// Password was changed: encrypt the password according the settings
$encryption_details = Security::encrypt_password($this->Password);
$this->Password = $encryption_details['password'];
$this->Salt = $encryption_details['salt'];
$this->PasswordEncryption = $encryption_details['algorithm'];
$this->changed['Salt'] = true;
$this->changed['PasswordEncryption'] = true;
}
parent::onBeforeWrite(); parent::onBeforeWrite();
} }