From 1814195f793a652883de80bd1874221676f786c5 Mon Sep 17 00:00:00 2001
From: Alexandre Dulaunoy <a@foo.be>
Date: Wed, 28 Apr 2021 14:08:09 +0200
Subject: [PATCH 1/2] chg: [objects] updated to the latest version

---
 app/files/misp-objects | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/files/misp-objects b/app/files/misp-objects
index e72cf9527..4b88a52cf 160000
--- a/app/files/misp-objects
+++ b/app/files/misp-objects
@@ -1 +1 @@
-Subproject commit e72cf95275f217e596fe2583fc137b6c9bd1d896
+Subproject commit 4b88a52cf4ac34b1ee23eaefe95aa9389a130b73

From ef9370514fbad0ea5842a392a848806fd7e919c7 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Wed, 28 Apr 2021 15:33:50 +0200
Subject: [PATCH 2/2] fix: [emailing] password resets and OTP didn't handle
 line breaks correctly

---
 app/Controller/UsersController.php | 1 +
 app/Model/User.php                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index eeb830c69..49d36a7a1 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -1739,6 +1739,7 @@ class UsersController extends AppController
 
             // Fetch user that contains also PGP or S/MIME keys for e-mail encryption
             $userForSendMail = $this->User->getUserById($user_id);
+            $body = str_replace('\n', PHP_EOL, $body);
             $result = $this->User->sendEmail($userForSendMail, $body, false, "[MISP] Email OTP");
 
             if ($result) {
diff --git a/app/Model/User.php b/app/Model/User.php
index c2de2ce60..19bb222a5 100644
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -806,7 +806,6 @@ class User extends AppModel
 
         $gpg = $this->initializeGpg();
         $sendEmail = new SendEmail($gpg);
-
         try {
             $result = $sendEmail->sendToUser($user, $subject, $body, $bodyNoEnc,$replyToUser ?: []);
 
@@ -943,6 +942,7 @@ class User extends AppModel
         }
         $body = str_replace('$password', $password, $body);
         $body = str_replace('$username', $user['User']['email'], $body);
+        $body = str_replace('\n', PHP_EOL, $body);
         $result = $this->sendEmail($user, $body, false, $subject);
         if ($result) {
             $this->id = $user['User']['id'];