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

Revert "Don't use HTMLPurifier in list views to improve performance" 

Performance gain turned out to be insignificant. This reverts commit 17bb725f84.

refs #9036
This commit is contained in:
Matthias Jentsch 2015-07-07 10:16:12 +02:00
parent 17bb725f84
commit 4f884b1529
4 changed files with 9 additions and 5 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

@ -27,7 +27,7 @@ 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 '';
@ -48,7 +48,11 @@ class Zend_View_Helper_PluginOutput extends Zend_View_Helper_Abstract
$this->view->escape($output) $this->view->escape($output)
); );
} }
return '<pre class="pluginoutput">' . $this->fixLinks($output) . '</pre>'; if (! $raw) {
$output = '<pre class="pluginoutput">' . $output . '</pre>';
}
$output = $this->fixLinks($output);
return $output;
} }
protected function fixLinks($html) protected function fixLinks($html)

2
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -90,7 +90,7 @@ if (count($hosts) === 0) {
) )
) ?>)</span> ) ?>)</span>
<?php endif ?> <?php endif ?>
<p class="pluginoutput"><?= $this->escape($this->ellipsis($host->host_output, 10000)) ?></p> <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?></p>
</td> </td>
<?php foreach($this->addColumns as $col): ?> <?php foreach($this->addColumns as $col): ?>
<td><?= $this->escape($host->$col) ?></td> <td><?= $this->escape($host->$col) ?></td>

2
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -48,7 +48,7 @@ if (count($notifications) === 0) {
<?= $this->link()->host($notification->host_name, $notification->host_display_name) ?> <?= $this->link()->host($notification->host_name, $notification->host_display_name) ?>
<?php endif ?> <?php endif ?>
<br> <br>
<?= $this->escape($this->ellipsis($notification->notification_output, 10000)) ?> <?= $this->pluginOutput($this->ellipsis($notification->notification_output, 10000), true) ?>
<br> <br>
<?php if (! $this->contact): ?> <?php if (! $this->contact): ?>
<small> <small>

2
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -82,7 +82,7 @@ if (count($services) === 0) {
) )
) ?><br /> ) ?><br />
<div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div> <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
<p class="pluginoutput"><?= $this->escape($this->ellipsis($service->service_output, 10000)) ?></p> <p class="pluginoutput"><?= $this->pluginOutput($this->ellipsis($service->service_output, 10000), true) ?></p>
</td> </td>
<?php foreach($this->addColumns as $col): ?> <?php foreach($this->addColumns as $col): ?>
<td><?= $this->escape($service->$col) ?></td> <td><?= $this->escape($service->$col) ?></td>