diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index f4cffaea7..193048334 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -36,9 +36,9 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
}
$pieChart->setStyle('margin: 0.2em 0.5em 0.2em 0.5em;');
$table[] = '
' . $pieChart->render()
- . htmlspecialchars($perfdata->getLabel())
+ . $this->escape($perfdata->getLabel())
. ' | '
- . htmlspecialchars($this->formatPerfdataValue($perfdata)) .
+ . $this->escape($this->formatPerfdataValue($perfdata)) .
' |
';
}
}
@@ -89,7 +89,7 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
protected function createInlinePie(Perfdata $perfdata)
{
$pieChart = new InlinePie($this->calculatePieChartData($perfdata), $perfdata->getLabel());
- $pieChart->setLabel(htmlspecialchars($perfdata->getLabel()));
+ $pieChart->setLabel($this->escape($perfdata->getLabel()));
$pieChart->setHideEmptyLabel();
//$pieChart->setHeight(32)->setWidth(32);
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index 81a061973..9fc05de8e 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -26,23 +26,23 @@ $contactHelper = $this->getHelper('ContactFlags');
= sprintf(
'%1$s:
%2$s',
t('Email'),
- htmlspecialchars($contact->contact_email)
+ $this->escape($contact->contact_email)
) ?>
contact_pager): ?>
= t('Pager') ?>:
- = htmlspecialchars($contact->contact_pager) ?>
+ = $this->escape($contact->contact_pager) ?>
= t('Service notification period') ?>:
- = htmlspecialchars($contact->contact_notify_service_timeperiod) ?>
+ = $this->escape($contact->contact_notify_service_timeperiod) ?>
= t('Host notification period') ?>:
- = htmlspecialchars($contact->contact_notify_host_timeperiod) ?>
+ = $this->escape($contact->contact_notify_host_timeperiod) ?>
diff --git a/modules/monitoring/application/views/scripts/show/contact.phtml b/modules/monitoring/application/views/scripts/show/contact.phtml
index 609bbbc69..a7b691eb4 100644
--- a/modules/monitoring/application/views/scripts/show/contact.phtml
+++ b/modules/monitoring/application/views/scripts/show/contact.phtml
@@ -7,8 +7,8 @@ $contactHelper = $this->getHelper('ContactFlags');
- = htmlspecialchars($contact->contact_name) ?> (=
- htmlspecialchars($contact->contact_alias)
+ = $this->escape($contact->contact_name) ?> (=
+ $this->escape($contact->contact_alias)
?>)
|
@@ -18,30 +18,30 @@ $contactHelper = $this->getHelper('ContactFlags');
= t('Email') ?> |
%1$s',
- htmlspecialchars($contact->contact_email)
+ $this->escape($contact->contact_email)
); ?> |
contact_pager): ?>
= t('Pager') ?> |
- = htmlspecialchars($contact->contact_pager) ?> |
+ = $this->escape($contact->contact_pager) ?> |
= t('Flags (service)') ?> |
- = htmlspecialchars($contactHelper->contactFlags($contact, 'service')) ?> |
+ = $this->escape($contactHelper->contactFlags($contact, 'service')) ?> |
= t('Flags (host)') ?> |
- = htmlspecialchars($contactHelper->contactFlags($contact, 'host')) ?> |
+ = $this->escape($contactHelper->contactFlags($contact, 'host')) ?> |
= t('Service notification period') ?> |
- = htmlspecialchars($contact->contact_notify_service_timeperiod) ?> |
+ = $this->escape($contact->contact_notify_service_timeperiod) ?> |
= t('Host notification period') ?> |
- = htmlspecialchars($contact->contact_notify_host_timeperiod) ?> |
+ = $this->escape($contact->contact_notify_host_timeperiod) ?> |