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

Identify perfdata containing html markup properly 

refs #9036
This commit is contained in:
Matthias Jentsch 2015-07-06 14:43:32 +02:00
parent aecfb2eb97
commit 9d2f0be24c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,13 +27,13 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
'@@@@@@', '@@@@@@',
); );
public function pluginOutput($output) public function pluginOutput($output, $raw = false)
{ {
if (empty($output)) { if (empty($output)) {
return ''; return '';
} }
$output = preg_replace('~<br[^>]+>~', "\n", $output); $output = preg_replace('~<br[^>]+>~', "\n", $output);
if (preg_match('~<\w+[^>^\\\]{,60}>~', $output)) { if (preg_match('~<\w+[^>^\\\]{0,60}>~', $output)) {
// HTML // HTML
$output = preg_replace('~<table~', '<table style="font-size: 0.75em"', $output = preg_replace('~<table~', '<table style="font-size: 0.75em"',
$this->getPurifier()->purify($output) $this->getPurifier()->purify($output)