From 85da0c2fe078a171df572ff5d4fe46b07548975d Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Sun, 23 Feb 2020 21:39:52 +0100
Subject: [PATCH] FIX #12091 cannot send email for forgotten password
---
src/app/user/controllers/UserController.php | 11 ++++++++---
src/core/controllers/AuthenticationController.php | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php
index d08f9045149..2f8d052733b 100755
--- a/src/app/user/controllers/UserController.php
+++ b/src/app/user/controllers/UserController.php
@@ -1644,10 +1644,10 @@ class UserController
UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$user['id']]]);
$url = UrlController::getCoreUrl() . 'apps/maarch_entreprise/index.php?display=true&page=login&update-password-token=' . $resetToken;
- EmailController::createEmail([
+ $email = EmailController::createEmail([
'userId' => $user['id'],
'data' => [
- 'sender' => ['email' => 'Notification'],
+ 'sender' => ['email' => $user['mail']],
'recipients' => [$user['mail']],
'object' => _NOTIFICATIONS_FORGOT_PASSWORD_SUBJECT,
'body' => _NOTIFICATIONS_FORGOT_PASSWORD_BODY . '<a href="' . $url . '">'._CLICK_HERE.'</a>' . _NOTIFICATIONS_FORGOT_PASSWORD_FOOTER,
@@ -1656,12 +1656,17 @@ class UserController
]
]);
+ if (!empty($email['errors'])) {
+ $historyMessage = $email['errors'];
+ } else {
+ $historyMessage = _PASSWORD_REINIT_SENT;
+ }
HistoryController::add([
'tableName' => 'users',
'recordId' => $body['login'],
'eventType' => 'RESETPSW',
'eventId' => 'userModification',
- 'info' => _PASSWORD_REINIT_SENT
+ 'info' => $historyMessage
]);
return $response->withStatus(204);
diff --git a/src/core/controllers/AuthenticationController.php b/src/core/controllers/AuthenticationController.php
index cc4e3e03469..0ab4388b1d8 100755
--- a/src/core/controllers/AuthenticationController.php
+++ b/src/core/controllers/AuthenticationController.php
@@ -150,7 +150,7 @@ class AuthenticationController
EmailController::createEmail([
'userId' => $args['userId'],
'data' => [
- 'sender' => ['email' => 'Notification'],
+ 'sender' => ['email' => $args['userEmail']],
'recipients' => [$args['userEmail']],
'object' => _NOTIFICATIONS_USER_CREATION_SUBJECT,
'body' => _NOTIFICATIONS_USER_CREATION_BODY . '<a href="' . $url . '">'._CLICK_HERE.'</a>' . _NOTIFICATIONS_USER_CREATION_FOOTER,
--
GitLab