diff --git a/common/mail/passwordResetToken.php b/common/mail/passwordResetToken.php index f6c7393..6c306ba 100644 --- a/common/mail/passwordResetToken.php +++ b/common/mail/passwordResetToken.php @@ -3,8 +3,9 @@ /* @var $this yii\web\View */ /* @var $user maddoger\user\common\models\User */ +/* @var $resetUrl array */ -$resetLink = Yii::$app->urlManager->createAbsoluteUrl(['user/auth/reset-password', 'token' => $user->password_reset_token]); +$resetLink = Yii::$app->urlManager->createAbsoluteUrl($resetUrl); echo Yii::t('maddoger/user', 'Hello {username}', ['username' => Html::encode($user->getName())]), ".\n\n", diff --git a/common/models/PasswordResetRequestForm.php b/common/models/PasswordResetRequestForm.php index 111940d..7f01f72 100644 --- a/common/models/PasswordResetRequestForm.php +++ b/common/models/PasswordResetRequestForm.php @@ -19,6 +19,9 @@ class PasswordResetRequestForm extends Model public $code; public $captchaAction; + public $resetUrl = ['user/auth/reset-password']; + public $mailView = 'passwordResetToken'; + /** * @inheritdoc */ @@ -73,7 +76,9 @@ public function sendEmail() } if ($user->save()) { - return Yii::$app->mailer->compose('@maddoger/user/common/mail/passwordResetToken', ['user' => $user]) + $resetUrl = $this->resetUrl; + $resetUrl['token'] = $user->password_reset_token; + return Yii::$app->mailer->compose($this->mailView, ['user' => $user, 'resetUrl' => $resetUrl]) ->setTo($this->email) ->setSubject(Yii::t('maddoger/user', 'Password reset for {app}', ['app' => \Yii::$app->name])) ->send();