recovery email format

Author: Joshua Heller

controllers/UsrController.php

@@ -24,13 +24,14 @@ public function sendEmail(\yii\base\Model $model, $mode)
             case 'recovery':
             case 'verify':
                 $subject = $mode == 'recovery'
-                    ? Yii::t('usr', 'Password recovery')
+                    ? Yii::t('usr', 'Finish resetting your Pitcher Admin password')
                     : Yii::t('usr', 'Email address verification');
                 $params['actionUrl'] = \yii\helpers\Url::toRoute([
                     $mode,
                     'activationKey' => $model->getIdentity()->getActivationKey(),
                     'username'      => $model->getIdentity()->username,
                 ], true);
+                $params['username'] = $model->getIdentity()->username;
                 break;
             case 'oneTimePassword':
                 $subject        = Yii::t('usr', 'One Time Password');

views/emails/recovery.php

@@ -1,11 +1,11 @@
 <p>
-    This message contains instructions to perform a password recovery. It was requested on the <?= \yii\helpers\Html::a(Yii::$app->name, $siteUrl); ?>. If you did not performed this request, please ignore this email or contact our administrator.
+	Pitcher recently received a request to reset the password for the username <?= \yii\helpers\Html::encode($username); ?>. To finish resetting your password, go to the following link. This link expires in 24 hours.
 </p>
 
-<p>To set a new password, open the following link:</p>
 <p>
-<?= \yii\helpers\Html::a($actionUrl, $actionUrl); ?>
+	<?= \yii\helpers\Html::a($actionUrl, $actionUrl); ?>
 </p>
+
 <p>
-If the link does not open correctly, try copying it and pasting in the browser's address bar.
-</p>
+	If you didn't ask for your password to be reset, contact support@pitcher.com.
+</p>