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

PluginOutput: Fix that subsequent escaped newlines are not transformed

Browse Source 
fixes #4297
This commit is contained in:
Johannes Meyer 2021-02-15 10:22:21 +01:00
parent a6e4307886
commit e01f51ffc7
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 * @var array
*/ */
protected static $txtPatterns = array( protected static $txtPatterns = array(
'~\\\n~',
'~\\\t~',
'~\\\n\\\n~', '~\\\n\\\n~',
'~\\\t~',
'~\\\n~',
'~(\[|\()OK(\]|\))~', '~(\[|\()OK(\]|\))~',
'~(\[|\()WARNING(\]|\))~', '~(\[|\()WARNING(\]|\))~',
'~(\[|\()CRITICAL(\]|\))~', '~(\[|\()CRITICAL(\]|\))~',
@ -52,9 +52,9 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
* @var array * @var array
*/ */
protected static $htmlPatterns = array( protected static $htmlPatterns = array(
'~\\\n~',
'~\\\t~',
'~\\\n\\\n~', '~\\\n\\\n~',
'~\\\t~',
'~\\\n~',
'~<table~' '~<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() public function testOutputWithHtmlEntities()
{ {
$this->checkOutput( $this->checkOutput(