leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes and user events docs

Browse Source
This commit is contained in:
Antonio Ramirez
2017-06-12 18:51:20 +02:00
parent 335a60383c
commit 4a80593435
10 changed files with 155 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/User/Form/SettingsForm.php
View File

@ -121,12 +121,13 @@ class SettingsForm extends Model
public function save()
{
if ($this->validate()) {
$this->user->scenario = 'settings';
$this->user->username = $this->username;
$this->user->password = $this->new_password;
if ($this->email == $this->user->email && $this->user->unconfirmed_email != null) {
$this->user->unconfirmed_email = null;
} elseif ($this->email != $this->user->email) {
$user = $this->getUser();
$user->scenario = 'settings';
$user->username = $this->username;
$user->password = $this->new_password;
if ($this->email == $user->email && $user->unconfirmed_email != null) {
$user->unconfirmed_email = null;
} elseif ($this->email != $user->email) {
$strategy = EmailChangeStrategyFactory::makeByStrategyType(
$this->getModule()->emailChangeStrategy,
$this
@ -135,7 +136,7 @@ class SettingsForm extends Model
return $strategy->run();
}
return $this->user->save();
return $user->save();
}
return false;