Commit aa3e8160 by Alexander Makarov

fixes #652 advanced app fixes

parent f1ba923e
...@@ -8,6 +8,7 @@ use common\models\LoginForm; ...@@ -8,6 +8,7 @@ use common\models\LoginForm;
use frontend\models\ContactForm; use frontend\models\ContactForm;
use common\models\User; use common\models\User;
use yii\web\HttpException; use yii\web\HttpException;
use yii\helpers\Security;
class SiteController extends Controller class SiteController extends Controller
{ {
...@@ -81,14 +82,14 @@ class SiteController extends Controller ...@@ -81,14 +82,14 @@ class SiteController extends Controller
$model = new User(); $model = new User();
$model->scenario = 'requestPasswordResetToken'; $model->scenario = 'requestPasswordResetToken';
if ($model->load($_POST) && $model->validate()) { if ($model->load($_POST) && $model->validate()) {
if ($this->sendPasswordResetEmail($email)) { if ($this->sendPasswordResetEmail($model->email)) {
Yii::$app->getSession()->setFlash('success', 'Check your email for further instructions.'); Yii::$app->getSession()->setFlash('success', 'Check your email for further instructions.');
$this->redirect('index'); $this->redirect('index');
} else { } else {
Yii::$app->getSession()->setFlash('error', 'There was an error sending email.'); Yii::$app->getSession()->setFlash('error', 'There was an error sending email.');
} }
} }
$this->render('requestPasswordResetToken', array( return $this->render('requestPasswordResetToken', array(
'model' => $model, 'model' => $model,
)); ));
} }
...@@ -110,7 +111,7 @@ class SiteController extends Controller ...@@ -110,7 +111,7 @@ class SiteController extends Controller
$this->redirect('index'); $this->redirect('index');
} }
$this->render('resetPassword', array( return $this->render('resetPassword', array(
'model' => $model, 'model' => $model,
)); ));
} }
...@@ -132,7 +133,7 @@ class SiteController extends Controller ...@@ -132,7 +133,7 @@ class SiteController extends Controller
$name = '=?UTF-8?B?' . base64_encode(\Yii::$app->name . ' robot') . '?='; $name = '=?UTF-8?B?' . base64_encode(\Yii::$app->name . ' robot') . '?=';
$subject = '=?UTF-8?B?' . base64_encode('Password reset for ' . \Yii::$app->name) . '?='; $subject = '=?UTF-8?B?' . base64_encode('Password reset for ' . \Yii::$app->name) . '?=';
$body = $this->renderPartial('/emails/passwordResetToken', array( $body = $this->renderPartial('/emails/passwordResetToken', array(
'user' => $this, 'user' => $user,
)); ));
$headers = "From: $name <{$fromEmail}>\r\n" . $headers = "From: $name <{$fromEmail}>\r\n" .
"MIME-Version: 1.0\r\n" . "MIME-Version: 1.0\r\n" .
......
...@@ -6,7 +6,7 @@ use yii\helpers\Html; ...@@ -6,7 +6,7 @@ use yii\helpers\Html;
* @var common\models\User $user; * @var common\models\User $user;
*/ */
$resetLink = $this->context->createUrl('site/resetPassword', array('token' => $user->password_reset_token)); $resetLink = Yii::$app->urlManager->createAbsoluteUrl('site/resetPassword', array('token' => $user->password_reset_token));
?> ?>
Hello <?php echo Html::encode($user->username)?>, Hello <?php echo Html::encode($user->username)?>,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment