tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-21 12:54:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Preserve <br>s in plugin output

Browse Source 
refs #3662
This commit is contained in:
Alexander A. Klimov 2019-03-01 14:59:55 +01:00 committed by Johannes Meyer
parent 723a2091a8
commit fff07144c3
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/monitoring/application/views/helpers/PluginOutput.php
View File

@ -102,7 +102,6 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
if ($command !== null) { if ($command !== null) {
$output = $this->hookRenderer->render($command, $output, ! $raw); $output = $this->hookRenderer->render($command, $output, ! $raw);
} }
$output = preg_replace('~<br[^>]*>~', "\n", $output);
if (preg_match('~<[^>]*["/\'][^>]*>~', $output)) { if (preg_match('~<[^>]*["/\'][^>]*>~', $output)) {
// HTML // HTML
$output = preg_replace( $output = preg_replace(

8
modules/monitoring/test/php/application/views/helpers/PluginOutputTest.php
View File

@ -92,15 +92,13 @@ class PluginOutputTest extends BaseTestCase
); );
/** @noinspection HtmlUnknownAttribute */ /** @noinspection HtmlUnknownAttribute */
$output = array( $output = array(
'Teststatus', 'Teststatus ',
'<a href="http://localhost/test.php" target="_blank"[^>]*>Info</a>', '<a href="http://localhost/test.php" target="_blank"[^>]*>Info</a><br><br>',
'',
'',
'<a href="http://localhost/test2.php" target="_blank"[^>]*>Info2</a>' '<a href="http://localhost/test2.php" target="_blank"[^>]*>Info2</a>'
); );
$this->checkHtmlOutput( $this->checkHtmlOutput(
join("\n", $input), join("\n", $input),
join("\n", $output), join('', $output),
true true
); );
} }