From 1cf5e47b55576f7b96ed07fa0e1b921a7db28ff5 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 10 Jan 2015 14:32:23 +0100
Subject: [PATCH] fix broken password reset mail in advanced app

- ensure HTML version is acutally HTML formatted
- added valid text version

fixes #6814
original issue #6748
---
 ...rdResetToken.php => passwordResetToken-html.php} |  9 +++++----
 .../common/mail/passwordResetToken-text.php         | 13 +++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 rename apps/advanced/common/mail/{passwordResetToken.php => passwordResetToken-html.php} (51%)

diff --git a/apps/advanced/common/mail/passwordResetToken.php b/apps/advanced/common/mail/passwordResetToken-html.php
similarity index 51%
rename from apps/advanced/common/mail/passwordResetToken.php
rename to apps/advanced/common/mail/passwordResetToken-html.php
index 4093dc97b9..f3daf49f68 100644
--- a/apps/advanced/common/mail/passwordResetToken.php
+++ b/apps/advanced/common/mail/passwordResetToken-html.php
@@ -6,9 +6,10 @@ use yii\helpers\Html;
 
 $resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
 ?>
+<div class="password-reset">
+    <p>Hello <?= Html::encode($user->username) ?>,</p>
 
-Hello <?= Html::encode($user->username) ?>,
+    <p>Follow the link below to reset your password:</p>
 
-Follow the link below to reset your password:
-
-<?= Html::a(Html::encode($resetLink), $resetLink) ?>
+    <p><?= Html::a(Html::encode($resetLink), $resetLink) ?></p>
+</div>
diff --git a/apps/advanced/common/mail/passwordResetToken-text.php b/apps/advanced/common/mail/passwordResetToken-text.php
index e69de29bb2..ba689cabad 100644
--- a/apps/advanced/common/mail/passwordResetToken-text.php
+++ b/apps/advanced/common/mail/passwordResetToken-text.php
@@ -0,0 +1,13 @@
+<?php
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $user common\models\User */
+
+$resetLink = Yii::$app->urlManager->createAbsoluteUrl(['site/reset-password', 'token' => $user->password_reset_token]);
+?>
+Hello <?= Html::encode($user->username) ?>,
+
+Follow the link below to reset your password:
+
+<?= $resetLink ?>