LOOP-1158: Handled newlines in mail body

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Helper/MailHelper.php

@@ -87,7 +87,7 @@ public function sendNotification(User $user, array $groupedMessages) {
       $section = array_map(function (Message $message) use ($langcode) {
         return $this->getMessageContent($message, $langcode);
       }, $messages);
-      $section = implode('<br>', $section);
+      $section = implode(PHP_EOL, $section);
       $sections[$type] = $section;
       $params[$type] = $section;
     }
@@ -119,12 +119,12 @@ public function sendNotification(User $user, array $groupedMessages) {
 
     $messagesWithHeadings = '';
     foreach ($messageSections as $heading => $content) {
-      $messagesWithHeadings .= $heading . '<br><br>' . implode('<br>', $content) . '<br><br>';
+      $messagesWithHeadings .= $heading . PHP_EOL . PHP_EOL . '* ' . implode(PHP_EOL . '* ', $content) . PHP_EOL . PHP_EOL;
     }
     $params['messages_with_headings'] = $messagesWithHeadings;
 
     $sections = array_filter($sections);
-    $params['messages'] = implode('<br><br>', $sections);
+    $params['messages'] = implode(PHP_EOL . PHP_EOL, $sections);
     $params['user'] = $user;
 
     $result = $this->mailer->mail(Helper::MODULE, self::NOTIFICATION_MAIL, $user->getEmail(), $langcode, $params, NULL, TRUE);

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Plugin/Mail/PhpMail.php

@@ -27,8 +27,8 @@ class PhpMail extends PhpMailBase implements MailInterface {
    *   The formatted $message.
    */
   public function format(array $message) {
-    $message['body'] = implode("\n\n", $message['body']);
-
+    $message['body'] = implode(PHP_EOL . PHP_EOL, $message['body']);
+    $message['body'] = nl2br($message['body']);
     $message['body'] = $this->makeUrlsAbsolute($message['body']);
 
     return $message;