From 87664ffef9414e4344e7037de53a9ac9784be5f8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 12 Dec 2014 10:38:21 +0100
Subject: [PATCH] Use the Host and Service object class helpers instead of
 MonitoringState

This also ensures that all state names that are shown to the user are
properly translated.

refs #7996
---
 .../application/views/helpers/MonitoringState.php   |  9 ++++++---
 .../application/views/scripts/list/hosts.phtml      |  6 ++++--
 .../views/scripts/list/servicegrid.phtml            |  7 ++++++-
 .../application/views/scripts/list/services.phtml   | 10 ++++++----
 .../views/scripts/show/components/header.phtml      | 13 ++++++++++---
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/MonitoringState.php b/modules/monitoring/application/views/helpers/MonitoringState.php
index 4db1a7a91..13bd93ea7 100644
--- a/modules/monitoring/application/views/helpers/MonitoringState.php
+++ b/modules/monitoring/application/views/helpers/MonitoringState.php
@@ -3,7 +3,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 /**
- * @deprecated Crap.
+ * @deprecated Most of these helpers are currently only used in the MultiController, which is probably obsolete
  */
 class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
 {
@@ -11,7 +11,7 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
     private $hoststates = array('up', 'down', 'unreachable', 99 => 'pending', null => 'pending');
 
     /**
-     * @deprecated The host or service object must know it's possible states.
+     * @deprecated Not used anywhere.
      */
     public function monitoringState($object, $type = 'service')
     {
@@ -22,6 +22,9 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
         }
     }
 
+    /**
+     * @deprecated Not used anywhere.
+     */
     public function monitoringStateById($id, $type = 'service')
     {
         if ($type === 'service') {
@@ -91,7 +94,7 @@ class Zend_View_Helper_MonitoringState extends Zend_View_Helper_Abstract
     }
 
     /**
-     * @deprecated Not translated.
+     * @deprecated Not used anywhere.
      */
     public function getStateTitle($object, $type)
     {
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 588d39712..7f3e73b0b 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,4 +1,6 @@
 <?php
+use Icinga\Module\Monitoring\Object\Host;
+
 $helper = $this->getHelper('MonitoringState');
 
 if ($this->compact): ?>
@@ -79,8 +81,8 @@ if ($hosts->count() === 0) {
     ?>
     <tr class="state <?= $hostStateName ?><?= $host->host_handled ? ' handled' : '' ?>">
       <!-- State -->
-      <td class="state" title="<?= $helper->getStateTitle($host, 'host') ?>">
-        <strong><?= ucfirst($helper->monitoringState($host, 'host')) ?></strong><br />
+      <td class="state">
+        <strong><?= strtoupper(Host::getStateText($host->host_state, true)); ?></strong><br />
         <?php if ((int) $host->host_state !== 99): ?>
         <?= $this->prefixedTimeSince($host->host_last_state_change, true) ?>
         <?php if ($host->host_state > 0 && (int) $host->host_state_type === 0): ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
index 19aef5d64..dd9be0394 100644
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@@ -1,3 +1,8 @@
+<?php
+
+use Icinga\Module\Monitoring\Object\Service;
+
+?>
 <?php if (!$this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
@@ -63,7 +68,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
           <a href="<?= $this->href('monitoring/show/service', array(
             'host'      => $service->host_name,
             'service'   => $service->service_description
-          )); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= $this->monitoringState($service, 'service'); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
+          )); ?>" title="<?= $this->escape($service->service_output); ?>" class="state_<?= Service::getStateText($service->service_state); ?> <?= $service->service_handled ? 'handled' : ''; ?>"></a>
         </td>
 <?php else: ?>
         <td>&middot;</td>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 2ea125527..2922abff5 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -1,4 +1,7 @@
 <?php
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
 $helper = $this->getHelper('MonitoringState');
 
 $selfUrl = 'monitoring/list/services';
@@ -54,9 +57,8 @@ foreach ($services as $service):
     $serviceStateName = strtolower($this->util()->getServiceStateName($service->service_state));
 ?>
     <tr class="state <?= $serviceStateName ?><?= $service->service_handled ? ' handled' : '' ?>">
-      <td class="state" title="<?= $helper->getStateTitle($service, 'service'); ?>">
-        <strong><?= $this->translate(strtoupper($helper->monitoringState($service, 'service'))) ?></strong><br />
-
+      <td class="state">
+        <strong><?= strtoupper(Service::getStateText($service->service_state, true)); ?></strong><br />
             <?php if (!$this->compact): ?><?= $this->prefixedTimeSince($service->service_last_state_change); ?><?php else: ?><?= $this->timeSince($service->service_last_state_change); ?><?php endif ?>
             <?php if ($service->service_state > 0 && (int) $service->service_state_type === 0): ?>
               <br />
@@ -106,7 +108,7 @@ foreach ($services as $service):
       <?php endif ?>
 <a href="<?= $serviceLink ?>"><?= $service->service_display_name ?></a><?php if ($this->showHost): ?> on <a href="<?= $hostLink ?>"><?= $service->host_name; ?>
 <?php if ($service->host_state != 0): ?>
- (<?= ucfirst($helper->monitoringState($service, 'host')); ?>)
+  (<?= strtoupper(Host::getStateText($service->host_state, true)); ?>)
 <?php endif ?>
 </a><?php endif ?><br />
         <p class="pluginoutput"><?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?></p>
diff --git a/modules/monitoring/application/views/scripts/show/components/header.phtml b/modules/monitoring/application/views/scripts/show/components/header.phtml
index a2c835e4a..c44602260 100644
--- a/modules/monitoring/application/views/scripts/show/components/header.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/header.phtml
@@ -1,9 +1,16 @@
-<?php $showService = $object->getType() === $object::TYPE_SERVICE ?>
+<?php
+
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+$showService = $object->getType() === $object::TYPE_SERVICE;
+
+?>
 <?php if (!$this->compact): ?>
 <?= $tabs ?>
 <?php endif ?>
 <table class="objectstate">
-  <tr class="state <?= $this->monitoringState($object, 'host') ?><?= $object->host_handled ? ' handled' : '' ?>">
+    <tr class="state <?= Host::getStateText($object->host_state); ?><?= $object->host_handled ? ' handled' : '' ?>">
     <td class="state"<?= $showService ? '' : ' rowspan="2"' ?>>
       <strong><?= $this->translate($this->util()->getHostStateName($object->host_state)) ?></strong><br />
       <?= $this->prefixedTimeSince($object->host_last_state_change, true) ?>
@@ -15,7 +22,7 @@
     </td>
   </tr>
 <?php if ($showService): ?>
-  <tr class="state <?= $this->monitoringState($object, 'service') ?><?= $object->service_handled ? ' handled' : '' ?>">
+  <tr class="state <?= Service::getStateText($object->service_state); ?><?= $object->service_handled ? ' handled' : '' ?>">
     <td class="state">
       <strong><?= $this->translate($this->util()->getServiceStateName($object->service_state)) ?></strong><br />
       <?= $this->prefixedTimeSince($object->service_last_state_change, true) ?>