From 20c2b6b3e5432feae14358407310cd9e8673b9e9 Mon Sep 17 00:00:00 2001
From: Elias Luhr <e.luhr@herzogkommunikation.de>
Date: Mon, 9 Jan 2023 15:43:52 +0100
Subject: [PATCH 1/3] Fixed password recovery link in welcome mail And add this
 new feature to the plain text variant too

---
 src/User/resources/views/mail/text/welcome.php | 7 +++++++
 src/User/resources/views/mail/welcome.php      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/User/resources/views/mail/text/welcome.php b/src/User/resources/views/mail/text/welcome.php
index 484209a..0d4516b 100644
--- a/src/User/resources/views/mail/text/welcome.php
+++ b/src/User/resources/views/mail/text/welcome.php
@@ -15,6 +15,9 @@
  * @var \Da\User\Module $module
  * @var bool $showPassword
  */
+
+use yii\helpers\Url;
+
 ?>
 <?= Yii::t('usuario', 'Hello') ?>,
 
@@ -23,6 +26,10 @@
     <?= Yii::t('usuario', 'We have generated a password for you') ?>:
     <?= $user->password ?>
 <?php endif ?>
+<?php if ($module->allowPasswordRecovery): ?>
+    <?= Yii::t('usuario', 'If you haven\'t received a password, you can reset it at') ?>:
+    <?= Url::to(['/user/recovery/request'], true) ?>
+<?php endif ?>
 
 <?php if ($token !== null): ?>
     <?= Yii::t('usuario', 'In order to complete your registration, please click the link below') ?>.
diff --git a/src/User/resources/views/mail/welcome.php b/src/User/resources/views/mail/welcome.php
index 6a54c05..526f079 100644
--- a/src/User/resources/views/mail/welcome.php
+++ b/src/User/resources/views/mail/welcome.php
@@ -30,7 +30,7 @@ use yii\helpers\Url;
         <?= Yii::t('usuario', 'We have generated a password for you') ?>: <strong><?= $user->password ?></strong>
     <?php endif ?>
     <?php if ($module->allowPasswordRecovery): ?>
-        <?= Yii::t('usuario', 'If you haven\'t received a password, you can reset it at') ?>: <strong><?= Html::a(Html::encode(Url::to(['/user/forgot'], true)), Url::to(['/user/forgot'], true)) ?></strong>
+        <?= Yii::t('usuario', 'If you haven\'t received a password, you can reset it at') ?>: <strong><?= Html::a(Html::encode(Url::to(['/user/recovery/request'], true)), Url::to(['/user/recovery/request'], true)) ?></strong>
     <?php endif ?>
 
 </p>

From 23106912011258282183fbb34a549be3ad1786f7 Mon Sep 17 00:00:00 2001
From: Elias Luhr <e.luhr@herzogkommunikation.de>
Date: Mon, 9 Jan 2023 15:54:28 +0100
Subject: [PATCH 2/3] updated changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c636053..b8f0ce6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## dev
+
+- Fix: use correct password recovery url in welcome mail and add functionality to plain text version of the mail
+
 ## 1.6.0 January 9, 2023
 
 **WARNING**: this release (long time due) makes a step forward in PHP

From 8a9adf351c48ec3f7058def49c0a9a86dd7edfb6 Mon Sep 17 00:00:00 2001
From: Lorenzo Milesi <lorenzo.milesi@yetopen.com>
Date: Mon, 9 Jan 2023 19:51:56 +0100
Subject: [PATCH 3/3] Added author to changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8f0ce6..802a099 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## dev
 
-- Fix: use correct password recovery url in welcome mail and add functionality to plain text version of the mail
+- Fix: use correct password recovery url in welcome mail and add functionality to plain text version of the mail (@eluhr)
 
 ## 1.6.0 January 9, 2023