diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php index 193048334..f4cffaea7 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() - . $this->escape($perfdata->getLabel()) + . htmlspecialchars($perfdata->getLabel()) . ' ' - . $this->escape($this->formatPerfdataValue($perfdata)) . + . htmlspecialchars($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($this->escape($perfdata->getLabel())); + $pieChart->setLabel(htmlspecialchars($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 9fc05de8e..81a061973 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');
%2$s', t('Email'), - $this->escape($contact->contact_email) + htmlspecialchars($contact->contact_email) ) ?>
contact_pager): ?>
: - escape($contact->contact_pager) ?> + contact_pager) ?>
: - escape($contact->contact_notify_service_timeperiod) ?> + contact_notify_service_timeperiod) ?>
: - escape($contact->contact_notify_host_timeperiod) ?> + 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 a7b691eb4..609bbbc69 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'); - escape($contact->contact_name) ?> (escape($contact->contact_alias) + contact_name) ?> (contact_alias) ?>) @@ -18,30 +18,30 @@ $contactHelper = $this->getHelper('ContactFlags'); %1$s', - $this->escape($contact->contact_email) + htmlspecialchars($contact->contact_email) ); ?> contact_pager): ?> - escape($contact->contact_pager) ?> + contact_pager) ?> - escape($contactHelper->contactFlags($contact, 'service')) ?> + contactFlags($contact, 'service')) ?> - escape($contactHelper->contactFlags($contact, 'host')) ?> + contactFlags($contact, 'host')) ?> - escape($contact->contact_notify_service_timeperiod) ?> + contact_notify_service_timeperiod) ?> - escape($contact->contact_notify_host_timeperiod) ?> + contact_notify_host_timeperiod) ?>