monitoring: Don't use str_replace for nl2br and escape comments befor…

…e creating ticket links
Icinga · Nov 3, 2015 · c0bc2e2 · c0bc2e2
1 parent 55f0863
commit c0bc2e2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -92,7 +92,7 @@ if (! $this->compact): ?>
                 <?= $this->link()->host($event->host_name, $event->host_display_name) ?>
             <?php endif ?>
                 <p class="plugin-output">
-                    <?= empty($msg) ? '' : $this->escape($msg) ?>
+                    <?= nl2br($this->createTicketLinks($this->escape($msg)), false) ?>
                 </p>
             </td>
         </tr>

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -70,7 +70,7 @@ if (! $this->compact): ?>
                                 $service->host_display_name
                             )
                         )
-                    ) ?>:
+                    ) ?>&#58;
                     <?php endif ?><?= $this->qlink(
                         $service->service_display_name,
                         $serviceLink,

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -46,7 +46,7 @@ $acknowledgement = $object->acknowledgement;
                 </span>
             </dt>
             <dd class="comment-text">
-                <p><?= nl2br($this->createTicketLinks($acknowledgement->getComment()), false) ?></p>
+                <p><?= nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment())), false) ?></p>
             </dd>
         </dl>
     </td>

diff --git a/modules/monitoring/application/views/scripts/show/components/comments.phtml b/modules/monitoring/application/views/scripts/show/components/comments.phtml
@@ -69,7 +69,7 @@ if (empty($object->comments) && ! $addLink) {
                 </span>
             </dt>
             <dd class="comment-text">
-                <?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($comment->comment)) ?>
+                <p><?= nl2br($this->createTicketLinks($this->escape($comment->comment)), false) ?></p>
             </dd>
         <?php endforeach ?>
         </dl>

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -99,7 +99,7 @@ if (empty($object->comments) && ! $addLink) {
                 </span>
             </dt>
             <dd class="comment-text">
-                <p><?= str_replace(array('\r\n', '\n'), '<br>', $this->createTicketLinks($downtime->comment)) ?></p>
+                <p><?= nl2br($this->createTicketLinks($this->escape($downtime->comment)), false) ?></p>
             </dd>
         <?php endforeach ?>
         </dl>