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

Merge pull request #4317 from Icinga/fix/newlines-in-plugin-output-4297

Browse Source 
Fix that subsequent escaped newlines are not transformed in plugin output
This commit is contained in:
Johannes Meyer 2021-02-15 11:34:32 +01:00 committed by GitHub
commit 712e74b3ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,9 +16,9 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
* @var array
*/
protected static $txtPatterns = array(
'~\\\n~',
'~\\\n\\\n~',
'~\\\t~',
'~\\\n\\\n~',
'~\\\n~',
'~(\[|\()OK(\]|\))~',
'~(\[|\()WARNING(\]|\))~',
'~(\[|\()CRITICAL(\]|\))~',
@ -52,9 +52,9 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
* @var array
*/
protected static $htmlPatterns = array(
'~\\\n~',
'~\\\t~',
'~\\\n\\\n~',
'~\\\t~',
'~\\\n~',
'~<table~'
);

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

@ -65,6 +65,14 @@ class PluginOutputTest extends BaseTestCase
);
}
public function testOutputWithNewlines()
{
$this->checkOutput(
'foo\nbar\n\nraboof',
"foo\nbar\nraboof"
);
}
public function testOutputWithHtmlEntities()
{
$this->checkOutput(