Skip to content

Commit

Permalink
Merge pull request #3949 from Icinga/feature/relax-html-restrictions-…
Browse files Browse the repository at this point in the history
…for-plugin-output

PluginOutput: Relax html restrictions
(cherry picked from commit 97c1c4e)
  • Loading branch information
nilmerg committed Sep 26, 2019
1 parent 6166d1e commit 85e4afa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
11 changes: 2 additions & 9 deletions modules/monitoring/application/views/helpers/PluginOutput.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,13 @@

use Icinga\Web\Dom\DomNodeIterator;
use Icinga\Web\View;
use Icinga\Module\Monitoring\Web\Helper\PluginOutputPurifier;
use Icinga\Web\Helper\HtmlPurifier;

/**
* Plugin output renderer
*/
class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
{
/**
* The return value of getPurifier()
*
* @var HTMLPurifier
*/
protected static $purifier;

/**
* Patterns to be replaced in plain text plugin output
*
Expand Down Expand Up @@ -107,7 +100,7 @@ public function pluginOutput($output, $raw = false, $command = null)
$output = preg_replace(
self::$htmlPatterns,
self::$htmlReplacements,
PluginOutputPurifier::process($output)
HtmlPurifier::process($output)
);
$isHtml = true;
} else {
Expand Down

This file was deleted.

0 comments on commit 85e4afa

Please sign in to comment.