From 0b455c82019cc707b2f1b58e6cc3689d68d42aef Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Tue, 4 Jan 2022 17:46:19 -0500
Subject: [PATCH] Agenda: Improve reminder content - refs BT#19392

---
 main/cron/agenda_reminders.php | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/main/cron/agenda_reminders.php b/main/cron/agenda_reminders.php
index 6854baf821..b50f17f38e 100644
--- a/main/cron/agenda_reminders.php
+++ b/main/cron/agenda_reminders.php
@@ -43,19 +43,19 @@ foreach ($reminders as $reminder) {
         }
 
         $eventDetails = [];
-        $eventDetails[] = '<strong>'.$event->getTitle().'</strong>';
+        $eventDetails[] = '<p><strong>'.$event->getTitle().'</strong></p>';
 
         if ($event->getAllDay()) {
-            $eventDetails[] = get_lang('AllDay');
+            $eventDetails[] = '<p class="small">'.get_lang('AllDay').'</p>';
         } else {
             $eventDetails[] = sprintf(
-                get_lang('FromDateX'),
+                '<p class="small">'.get_lang('FromDateX').'</p>',
                 api_get_local_time($event->getDate(), null, null, false, true, true)
             );
 
             if (!empty($event->getEnddate())) {
                 $eventDetails[] = sprintf(
-                    get_lang('UntilDateX'),
+                    '<p class="small">'.get_lang('UntilDateX').'</p>',
                     api_get_local_time($event->getEnddate(), null, null, false, true, true)
                 );
             }
@@ -66,7 +66,7 @@ foreach ($reminders as $reminder) {
         }
 
         $messageSubject = sprintf(get_lang('ReminderXEvent'), $event->getTitle());
-        $messageContent = implode('<br />', $eventDetails);
+        $messageContent = implode(PHP_EOL, $eventDetails);
 
         MessageManager::send_message_simple(
             $event->getUser(),
@@ -107,19 +107,19 @@ foreach ($reminders as $reminder) {
         }
 
         $eventDetails = [];
-        $eventDetails[] = '<strong>'.$event->getTitle().'</strong>';
+        $eventDetails[] = '<p><strong>'.$event->getTitle().'</strong></p>';
 
         if ($event->getAllDay()) {
-            $eventDetails[] = get_lang('AllDay');
+            $eventDetails[] = '<p class="small">'.get_lang('AllDay').'</p>';
         } else {
             $eventDetails[] = sprintf(
-                get_lang('FromDateX'),
+                '<p class="small">'.get_lang('FromDateX').'</p>',
                 api_get_local_time($event->getStartDate(), null, null, false, true, true)
             );
 
             if (!empty($event->getEndDate())) {
                 $eventDetails[] = sprintf(
-                    get_lang('UntilDateX'),
+                    '<p class="small">'.get_lang('UntilDateX').'</p>',
                     api_get_local_time($event->getEndDate(), null, null, false, true, true)
                 );
             }
@@ -129,8 +129,12 @@ foreach ($reminders as $reminder) {
             $eventDetails[] = $event->getContent();
         }
 
+        if (!empty($event->getComment())) {
+            $eventDetails[] = '<p class="small">'.$event->getComment().'</p>';
+        }
+
         $messageSubject = sprintf(get_lang('ReminderXEvent'), $event->getTitle());
-        $messageContent = implode('<br />', $eventDetails);
+        $messageContent = implode(PHP_EOL, $eventDetails);
 
         $courseInfo = api_get_course_info_by_id($event->getCId());