diff --git a/apps/advanced/common/models/User.php b/apps/advanced/common/models/User.php index b388529..91550a1 100644 --- a/apps/advanced/common/models/User.php +++ b/apps/advanced/common/models/User.php @@ -129,7 +129,10 @@ class User extends ActiveRecord implements IdentityInterface public function rules() { return [ + ['status', 'default', 'value' => self::STATUS_ACTIVE], ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]], + + ['role', 'default', 'value' => self::ROLE_USER], ['role', 'in', 'range' => [self::ROLE_USER]], ['username', 'filter', 'filter' => 'trim'], diff --git a/apps/advanced/frontend/models/forms/ResetPasswordForm.php b/apps/advanced/frontend/models/forms/ResetPasswordForm.php index 614cf24..de9852f 100644 --- a/apps/advanced/frontend/models/forms/ResetPasswordForm.php +++ b/apps/advanced/frontend/models/forms/ResetPasswordForm.php @@ -58,13 +58,9 @@ class ResetPasswordForm extends Model public function resetPassword() { $user = $this->_user; - if ($user->validate()) { - $user->password = $this->password; - $user->removePasswordResetToken(); - return $user->save(); - } else { - return false; - } + $user->password = $this->password; + $user->removePasswordResetToken(); + return $user->save(); } } \ No newline at end of file diff --git a/apps/advanced/frontend/models/forms/SignupForm.php b/apps/advanced/frontend/models/forms/SignupForm.php index 5c99214..e5693d6 100644 --- a/apps/advanced/frontend/models/forms/SignupForm.php +++ b/apps/advanced/frontend/models/forms/SignupForm.php @@ -41,13 +41,7 @@ class SignupForm extends Model public function signup() { if ($this->validate()) { - $user = new User(); - $user->username = $this->username; - $user->email = $this->email; - $user->password = $this->password; - $user->generatePasswordResetToken(); - $user->role = User::ROLE_USER; - $user->status = User::STATUS_ACTIVE; + $user = User::create($this->attributes); if ($user->save()) { return $user; } diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php index 54d9445..d8cb15d 100644 --- a/framework/db/BaseActiveRecord.php +++ b/framework/db/BaseActiveRecord.php @@ -986,8 +986,6 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface /** * Creates an active record object using a row of data from the database/storage. * - * This method is *not* meant to be used to create new records. - * * It is an internal method meant to be called to create active record objects after * fetching data from the database. It is mainly used by [[ActiveQuery]] to populate * the query results into Active Records.