tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

monitoring: Use nl2br instead of str_replace for downtime comment and comment text

This commit is contained in:
Eric Lippmann 2015-01-23 09:45:43 +01:00
parent f47dae1092
commit d07e1329e8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/views/scripts/show/components/comments.phtml
View File

@ -34,7 +34,7 @@
foreach ($object->comments as $comment) { foreach ($object->comments as $comment) {
// Ticket hook sample // Ticket hook sample
$text = $this->tickets ? preg_replace_callback( $commentText = $this->tickets ? preg_replace_callback(
$this->tickets->getPattern(), $this->tickets->getPattern(),
array($this->tickets, 'createLink'), array($this->tickets, 'createLink'),
$this->escape($comment->comment) $this->escape($comment->comment)
@ -56,7 +56,7 @@ foreach ($object->comments as $comment) {
(<?= ucfirst($comment->type) ?>): (<?= ucfirst($comment->type) ?>):
</td> </td>
<td style="padding-left: .5em;"> <td style="padding-left: .5em;">
<?= str_replace(array('\r\n', '\n'), '<br>', $text) ?> <?= nl2br($commentText) ?>
</td> </td>
</tr> </tr>
</table> </table>

4
modules/monitoring/application/views/scripts/show/components/downtime.phtml
View File

@ -34,7 +34,7 @@
foreach ($object->downtimes as $downtime) { foreach ($object->downtimes as $downtime) {
// Ticket hook sample // Ticket hook sample
$text = $this->tickets ? preg_replace_callback( $commentText = $this->tickets ? preg_replace_callback(
$this->tickets->getPattern(), $this->tickets->getPattern(),
array($this->tickets, 'createLink'), array($this->tickets, 'createLink'),
$this->escape($downtime->comment) $this->escape($downtime->comment)
@ -66,7 +66,7 @@ foreach ($object->downtimes as $downtime) {
<?= $state ?> <?= $state ?>
</td> </td>
<td style="padding-left: .5em;"> <td style="padding-left: .5em;">
<?= str_replace(array('\r\n', '\n'), '<br>', $text) ?> <?= nl2br($commentText) ?>
</td> </td>
</tr> </tr>
</table> </table>