From 0ba4d24880bf96ea3f1f727055ee2705ca289b82 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 29 May 2015 14:17:12 +0200
Subject: [PATCH 01/24] Move notifications to the bottom of the page

refs #8247
---
 application/layouts/scripts/body.phtml | 45 +++++++++++++-------------
 library/Icinga/Web/StyleSheet.php      |  1 +
 public/css/icinga/footer-elements.less |  8 +++++
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 public/css/icinga/footer-elements.less

diff --git a/application/layouts/scripts/body.phtml b/application/layouts/scripts/body.phtml
index 78bb4f91d..5da1e4322 100644
--- a/application/layouts/scripts/body.phtml
+++ b/application/layouts/scripts/body.phtml
@@ -5,29 +5,20 @@ use Icinga\Web\Notification;
 use Icinga\Authentication\Manager as Auth;
 
 
-if (Auth::getInstance()->isAuthenticated()): ?>
- <div id="header">
-   <ul id="notifications"><?php
-
-$moduleName = $this->layout()->moduleName;
-if ($moduleName) {
-    $moduleClass = ' icinga-module module-' . $moduleName;
-} else {
-    $moduleClass = '';
-}
-
-$refresh = '';
-if ($this->layout()->autorefreshInterval) {
-    $refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
-}
-
-$notifications = Notification::getInstance();
-if ($notifications->hasMessages()) {
-    foreach ($notifications->getMessages() as $m) {
-        echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+if (Auth::getInstance()->isAuthenticated()):
+    $moduleName = $this->layout()->moduleName;
+    if ($moduleName) {
+        $moduleClass = ' icinga-module module-' . $moduleName;
+    } else {
+        $moduleClass = '';
     }
-}
-   ?></ul>
+
+    $refresh = '';
+    if ($this->layout()->autorefreshInterval) {
+        $refresh = ' data-icinga-refresh="' . $this->layout()->autorefreshInterval . '"';
+    }
+?>
+ <div id="header">
    <div id="logo" data-base-target="_main">
        <?= $this->qlink(
            '',
@@ -56,6 +47,16 @@ if ($notifications->hasMessages()) {
   <div id="col3" class="container">
   </div>
  </div><!-- END of main -->
+ <div id="footer">
+   <ul id="notifications"><?php
+$notifications = Notification::getInstance();
+if ($notifications->hasMessages()) {
+    foreach ($notifications->getMessages() as $m) {
+        echo '<li class="' . $m->type . '">' . $this->escape($m->message) . '</li>';
+    }
+}
+   ?></ul>
+ </div>
 <?php else: ?>
 <?= $this->render('inline.phtml') ?>
 <?php endif ?>
diff --git a/library/Icinga/Web/StyleSheet.php b/library/Icinga/Web/StyleSheet.php
index ab36d78c5..cbd2c8aba 100644
--- a/library/Icinga/Web/StyleSheet.php
+++ b/library/Icinga/Web/StyleSheet.php
@@ -18,6 +18,7 @@ class StyleSheet
         'css/icinga/layout-structure.less',
         'css/icinga/menu.less',
         'css/icinga/header-elements.less',
+        'css/icinga/footer-elements.less',
         'css/icinga/main-content.less',
         'css/icinga/tabs.less',
         'css/icinga/forms.less',
diff --git a/public/css/icinga/footer-elements.less b/public/css/icinga/footer-elements.less
new file mode 100644
index 000000000..a9d513103
--- /dev/null
+++ b/public/css/icinga/footer-elements.less
@@ -0,0 +1,8 @@
+/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
+
+div#footer {
+  position: fixed;
+  left: 0px;
+  right: 0px;
+  bottom: 0px;
+}

From 1f36e545d99f55c46425bc44b125eb8a66683765 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 29 May 2015 17:26:56 +0200
Subject: [PATCH 02/24] Implement ::getState()

refs #8205
---
 .../library/Monitoring/Plugin/Perfdata.php    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index b1c71cb72..ef91f7f93 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -7,6 +7,7 @@ use Icinga\Util\Format;
 use InvalidArgumentException;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Web\Widget\Chart\InlinePie;
+use Icinga\Module\Monitoring\Object\Service;
 use Zend_Controller_Front;
 
 class Perfdata
@@ -453,4 +454,30 @@ class Perfdata
         );
         return $parts;
     }
+
+    /**
+     * Return the state indicated by this perfdata
+     *
+     * @see Service
+     *
+     * @return int
+     */
+    public function getState()
+    {
+        if ($this->value === null) {
+            return Service::STATE_UNKNOWN;
+        }
+
+        if (! ($this->criticalThreshold === null
+            || $this->value < $this->criticalThreshold)) {
+            return Service::STATE_CRITICAL;
+        }
+
+        if (! ($this->warningThreshold === null
+            || $this->value < $this->warningThreshold)) {
+            return Service::STATE_WARNING;
+        }
+
+        return Service::STATE_OK;
+    }
 }

From 6e24cfd538f31f9093818081a12ed2a3964762a5 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 29 May 2015 17:26:56 +0200
Subject: [PATCH 03/24] Implement ::worseThan()

refs #8205
---
 .../library/Monitoring/Plugin/Perfdata.php    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
index ef91f7f93..c1af78114 100644
--- a/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
+++ b/modules/monitoring/library/Monitoring/Plugin/Perfdata.php
@@ -480,4 +480,34 @@ class Perfdata
 
         return Service::STATE_OK;
     }
+
+    /**
+     * Return whether the state indicated by this perfdata is worse than
+     * the state indicated by the other perfdata
+     * CRITICAL > UNKNOWN > WARNING > OK
+     *
+     * @param Perfdata $rhs     the other perfdata
+     *
+     * @return bool
+     */
+    public function worseThan(Perfdata $rhs)
+    {
+        if (($state = $this->getState()) === ($rhsState = $rhs->getState())) {
+            return $this->getPercentage() > $rhs->getPercentage();
+        }
+
+        if ($state === Service::STATE_CRITICAL) {
+            return true;
+        }
+
+        if ($state === Service::STATE_UNKNOWN) {
+            return $rhsState !== Service::STATE_CRITICAL;
+        }
+
+        if ($state === Service::STATE_WARNING) {
+            return $rhsState === Service::STATE_OK;
+        }
+
+        return false;
+    }
 }

From 9a141d5e3c458f9c80bdced0529ba9b3dabde9c3 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 29 May 2015 18:39:16 +0200
Subject: [PATCH 04/24] Sort Perfdata by ::worseThan() DESC

refs #8205
---
 .../application/views/helpers/Perfdata.php          | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 36cbaa319..1ff59b6ae 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -19,6 +19,19 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
     public function perfdata($perfdataStr, $compact = false, $limit = 0, $color = Perfdata::PERFDATA_OK)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
+
+        if (1 < ($i = count($pieChartData))) {
+            while (--$i) {
+                for ($j = 0, $k = 1; $j < $i; ++$j, ++$k) {
+                    if ($pieChartData[$k]->worseThan($pieChartData[$j])) {
+                        $perfdata = $pieChartData[$k];
+                        $pieChartData[$k] = $pieChartData[$j];
+                        $pieChartData[$j] = $perfdata;
+                    }
+                }
+            }
+        }
+
         $results = array();
         $table = array(
             '<td><b>' . implode(

From d7e850da0ef554841d7c48ac148d29ad3690bfda Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@netways.de>
Date: Fri, 29 May 2015 18:41:07 +0200
Subject: [PATCH 05/24] Show at most 5 pie charts in the services list

refs #8205
---
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 9f87e7c60..c9dae8332 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -60,7 +60,7 @@ if (count($services) === 0) {
       </td>
 
       <td>
-        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 8) ?> </div>
+        <div class="sparkline-box"><?= $this->perfdata($service->service_perfdata, true, 5) ?> </div>
         <?= $this->iconImage()->service($service) ?>
         <?= implode(' ', $this->serviceFlags($service)); ?>
         <?= $this->qlink(

From 00ae69a694e846596bc7c179ec3867da1cf8d4f9 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 2 Jun 2015 16:36:01 +0200
Subject: [PATCH 06/24] Fix PHP 5.6.9 error: The use statement with
 non-compound name 'Exception' has no effect

refs #9281
---
 application/controllers/DashboardController.php        | 1 -
 application/controllers/GroupController.php            | 1 -
 application/controllers/UserController.php             | 1 -
 application/controllers/UsergroupbackendController.php | 1 -
 4 files changed, 4 deletions(-)

diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php
index 7e4ac479b..b00ddf2b8 100644
--- a/application/controllers/DashboardController.php
+++ b/application/controllers/DashboardController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Exception\ProgrammingError;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Forms\Dashboard\DashletForm;
diff --git a/application/controllers/GroupController.php b/application/controllers/GroupController.php
index 70954aaf1..cef7894e6 100644
--- a/application/controllers/GroupController.php
+++ b/application/controllers/GroupController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Data\DataArray\ArrayDatasource;
 use Icinga\Data\Reducible;
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
index c71fe9696..4cade32b7 100644
--- a/application/controllers/UserController.php
+++ b/application/controllers/UserController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Logger;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\NotFoundError;
diff --git a/application/controllers/UsergroupbackendController.php b/application/controllers/UsergroupbackendController.php
index cdb6826be..2f5dd9030 100644
--- a/application/controllers/UsergroupbackendController.php
+++ b/application/controllers/UsergroupbackendController.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Exception;
 use Icinga\Application\Config;
 use Icinga\Exception\NotFoundError;
 use Icinga\Forms\ConfirmRemovalForm;

From c316e5ce8f69b19fefc154eaf9e8784d34f199c9 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 13:48:56 +0200
Subject: [PATCH 07/24] Revert "monitoring: Remove the services tab when
 showing an object's history"

This reverts commit b3e0851b62d079c49d486b542c7845e662e88068.
---
 .../application/controllers/ShowController.php      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 538a75132..d60bbebd2 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -214,6 +214,19 @@ class Monitoring_ShowController extends Controller
                 )
             );
         }
+        $tabs->add(
+            'services',
+            array(
+                'title'     => sprintf(
+                    $this->translate('List all services on host %s'),
+                    $isService ? $object->getHost()->getName() : $object->getName()
+                ),
+                'label'     => $this->translate('Services'),
+                'icon'      => 'services',
+                'url'       => 'monitoring/show/services',
+                'urlParams' => $params,
+            )
+        );
         if ($this->backend->hasQuery('eventHistory')) {
             $tabs->add(
                 'history',

From ca678a57e91e1bb2f0a824ba90dedb07e2e87720 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 13:49:04 +0200
Subject: [PATCH 08/24] Revert "monitoring: Remove the services tab when
 showing host or service details"

This reverts commit 646cffd62d615e6a4d716440a9f5728c19b87120.
---
 .../Web/Controller/MonitoredObjectController.php    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 7ac509d7b..9d27b1268 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -181,6 +181,19 @@ abstract class MonitoredObjectController extends Controller
                 )
             );
         }
+        $tabs->add(
+            'services',
+            array(
+                'title'     => sprintf(
+                    $this->translate('List all services on host %s'),
+                    $isService ? $object->getHost()->getName() : $object->getName()
+                ),
+                'label'     => $this->translate('Services'),
+                'icon'      => 'services',
+                'url'       => 'monitoring/show/services',
+                'urlParams' => $params
+            )
+        );
         if ($this->backend->hasQuery('eventHistory')) {
             $tabs->add(
                 'history',

From 68be11b929157b574324c41e7e10c85c6672a6dc Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:01:42 +0200
Subject: [PATCH 09/24] UrlParams: Allow conversion to an associative array

---
 library/Icinga/Web/UrlParams.php | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/UrlParams.php b/library/Icinga/Web/UrlParams.php
index d97f83b39..504c076be 100644
--- a/library/Icinga/Web/UrlParams.php
+++ b/library/Icinga/Web/UrlParams.php
@@ -374,9 +374,29 @@ class UrlParams
         }
     }
 
-    public function toArray()
+    /**
+     * Return the parameters of this url as sequenced or associative array
+     *
+     * @param   bool    $sequenced
+     *
+     * @return  array
+     */
+    public function toArray($sequenced = true)
     {
-        return $this->params;
+        if ($sequenced) {
+            return $this->params;
+        }
+
+        $params = array();
+        foreach ($this->params as $param) {
+            if ($param[1] === true) {
+                $params[] = $param[0];
+            } else {
+                $params[$param[0]] = $param[1];
+            }
+        }
+
+        return $params;
     }
 
     public function toString($separator = null)

From ba4dd255ec69a8e579f2c198c332e6f65e3e406b Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:02:32 +0200
Subject: [PATCH 10/24] Tabs: Merge the action's params into the current
 request url's params

---
 library/Icinga/Web/Widget/Tabs.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index aa5e7cda6..6b38f9096 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -309,13 +309,14 @@ EOT;
 
     private function renderRefreshTab()
     {
-        $url = Url::fromRequest()->without('renderLayout');
         $tab = $this->get($this->getActiveName());
-
         if ($tab !== null) {
+            $url = Url::fromRequest($tab->getUrl()->getParams()->toArray(false))->without('renderLayout');
             $label = $this->view()->escape(
                 $tab->getLabel()
             );
+        } else {
+            $url = Url::fromRequest()->without('renderLayout');
         }
 
         if (! empty($label)) {

From c05594b12459dfc45fd09546351f9a4b889c580f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:03:17 +0200
Subject: [PATCH 11/24] ShowController: Fix link to show a host's services

---
 modules/monitoring/application/controllers/ShowController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index d60bbebd2..60f2b186f 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -223,7 +223,7 @@ class Monitoring_ShowController extends Controller
                 ),
                 'label'     => $this->translate('Services'),
                 'icon'      => 'services',
-                'url'       => 'monitoring/show/services',
+                'url'       => 'monitoring/host/services',
                 'urlParams' => $params,
             )
         );

From c221e0c082bd7a0f177dfbd79d2b71b931b2b283 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:03:41 +0200
Subject: [PATCH 12/24] MonitoredObjectController: Fix link to show a host's
 services

---
 .../Monitoring/Web/Controller/MonitoredObjectController.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 9d27b1268..a9d05e8fa 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -190,7 +190,7 @@ abstract class MonitoredObjectController extends Controller
                 ),
                 'label'     => $this->translate('Services'),
                 'icon'      => 'services',
-                'url'       => 'monitoring/show/services',
+                'url'       => 'monitoring/host/services',
                 'urlParams' => $params
             )
         );

From d81e637ae9a14dbf8dc96248ff3c7ce4fced95bf Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:04:45 +0200
Subject: [PATCH 13/24] HostController: Add action to show a host's services

---
 .../controllers/HostController.php            | 50 +++++++++++++++++++
 .../views/scripts/host/services.phtml         | 17 +++++++
 2 files changed, 67 insertions(+)
 create mode 100644 modules/monitoring/application/views/scripts/host/services.phtml

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index 464da200c..c014b96f6 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -10,6 +10,7 @@ use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandF
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 use Icinga\Web\Hook;
+use Icinga\Web\Widget;
 
 class Monitoring_HostController extends MonitoredObjectController
 {
@@ -63,6 +64,55 @@ class Monitoring_HostController extends MonitoredObjectController
         parent::showAction();
     }
 
+    /**
+     * List a host's services
+     */
+    public function servicesAction()
+    {
+        $this->setAutorefreshInterval(10);
+        $this->getTabs()->activate('services');
+        $query = $this->backend->select()->from('serviceStatus', array(
+            'host_name',
+            'host_display_name',
+            'host_state',
+            'host_state_type',
+            'host_last_state_change',
+            'host_address',
+            'host_handled',
+            'service_description',
+            'service_display_name',
+            'service_state',
+            'service_in_downtime',
+            'service_acknowledged',
+            'service_handled',
+            'service_output',
+            'service_perfdata',
+            'service_attempt',
+            'service_last_state_change',
+            'service_icon_image',
+            'service_icon_image_alt',
+            'service_is_flapping',
+            'service_state_type',
+            'service_handled',
+            'service_severity',
+            'service_last_check',
+            'service_notifications_enabled',
+            'service_action_url',
+            'service_notes_url',
+            'service_last_comment',
+            'service_last_ack',
+            'service_last_downtime',
+            'service_active_checks_enabled',
+            'service_passive_checks_enabled',
+            'current_check_attempt' => 'service_current_check_attempt',
+            'max_check_attempts'    => 'service_max_check_attempts'
+        ));
+        $query->applyFilter(Widget::create('filterEditor')->setQuery($query)->getFilter());
+        $this->applyRestriction('monitoring/filter/objects', $query);
+        $this->view->services = $query;
+        $this->view->object = $this->object;
+    }
+
     /**
      * Acknowledge a host problem
      */
diff --git a/modules/monitoring/application/views/scripts/host/services.phtml b/modules/monitoring/application/views/scripts/host/services.phtml
new file mode 100644
index 000000000..ca12f3d0e
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/host/services.phtml
@@ -0,0 +1,17 @@
+<div class="controls">
+  <?php if (! $this->compact): ?>
+    <?= $this->tabs; ?>
+  <?php endif ?>
+  <?= $this->render('partials/host/object-header.phtml') ?>
+  <?= $this->render('partials/host/servicesummary.phtml') ?>
+</div>
+<?= $this->partial(
+  'list/services.phtml',
+  'monitoring',
+  array(
+    'compact'       => true,
+    'showHost'      => false,
+    'services'      => $services,
+    'addColumns'    => array()
+  )
+); ?>
\ No newline at end of file

From 5bf7bbdb8b5fa4198de611acc1cc5d47e12f3599 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 16 Jun 2015 16:06:19 +0200
Subject: [PATCH 14/24] Remove unneeded use statements from global namespaces

Use statements on global classes from the global namespace don't have any effect, prevent warnings from being displayed in php versions >= 5.6.9 and version >= 5.5.25.

refs #9281
---
 application/views/helpers/FormNumber.php | 2 --
 modules/doc/run.php                      | 1 -
 2 files changed, 3 deletions(-)

diff --git a/application/views/helpers/FormNumber.php b/application/views/helpers/FormNumber.php
index 8f18a14a0..13256f810 100644
--- a/application/views/helpers/FormNumber.php
+++ b/application/views/helpers/FormNumber.php
@@ -1,8 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_View_Helper_FormElement;
-
 /**
  * Render number input controls
  */
diff --git a/modules/doc/run.php b/modules/doc/run.php
index 95abbf9df..d0712a858 100644
--- a/modules/doc/run.php
+++ b/modules/doc/run.php
@@ -1,7 +1,6 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use \Zend_Controller_Router_Route;
 use Icinga\Application\Icinga;
 
 if (Icinga::app()->isCli()) {

From 4a2a17aba111b9adba98b7284bc72f6f7a9bc99c Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:34:45 +0200
Subject: [PATCH 15/24] HostController: Do not permit to filter the
 servicesAction

---
 modules/monitoring/application/controllers/HostController.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/modules/monitoring/application/controllers/HostController.php b/modules/monitoring/application/controllers/HostController.php
index c014b96f6..c3c101c09 100644
--- a/modules/monitoring/application/controllers/HostController.php
+++ b/modules/monitoring/application/controllers/HostController.php
@@ -10,7 +10,6 @@ use Icinga\Module\Monitoring\Forms\Command\Object\SendCustomNotificationCommandF
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Web\Controller\MonitoredObjectController;
 use Icinga\Web\Hook;
-use Icinga\Web\Widget;
 
 class Monitoring_HostController extends MonitoredObjectController
 {
@@ -107,9 +106,8 @@ class Monitoring_HostController extends MonitoredObjectController
             'current_check_attempt' => 'service_current_check_attempt',
             'max_check_attempts'    => 'service_max_check_attempts'
         ));
-        $query->applyFilter(Widget::create('filterEditor')->setQuery($query)->getFilter());
         $this->applyRestriction('monitoring/filter/objects', $query);
-        $this->view->services = $query;
+        $this->view->services = $query->where('host_name', $this->object->getName());
         $this->view->object = $this->object;
     }
 

From e96c6958b28973f7e8c349c60a50a561d047ace1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 16:36:13 +0200
Subject: [PATCH 16/24] MonitoredObjectController: Show the service tab, if it
 was already shown

---
 .../Web/Controller/MonitoredObjectController.php         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index a9d05e8fa..0b1cda923 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -145,6 +145,9 @@ abstract class MonitoredObjectController extends Controller
             $params = array(
                 'host' => $object->getName()
             );
+            if ($this->params->has('service')) {
+                $params['service'] = $this->params->get('service');
+            }
         } else {
             $isService = true;
             $params = array(
@@ -165,14 +168,14 @@ abstract class MonitoredObjectController extends Controller
                 'urlParams' => $params
             )
         );
-        if ($isService) {
+        if ($isService || $this->params->has('service')) {
             $tabs->add(
                 'service',
                 array(
                     'title'     => sprintf(
                         $this->translate('Show detailed information for service %s on host %s'),
-                        $object->getName(),
-                        $object->getHost()->getName()
+                        $isService ? $object->getName() : $this->params->get('service'),
+                        $isService ? $object->getHost()->getName() : $object->getName()
                     ),
                     'label'     => $this->translate('Service'),
                     'icon'      => 'service',

From 196450d8cf7f5ac69ee667eb05450481761b0a72 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 17:04:36 +0200
Subject: [PATCH 17/24] MonitoredObjectController: Add historyAction

---
 .../views/scripts/host/history.phtml          | 169 ++++++++++++++++++
 .../views/scripts/service/history.phtml       | 151 ++++++++++++++++
 .../Controller/MonitoredObjectController.php  |  15 +-
 3 files changed, 334 insertions(+), 1 deletion(-)
 create mode 100644 modules/monitoring/application/views/scripts/host/history.phtml
 create mode 100644 modules/monitoring/application/views/scripts/service/history.phtml

diff --git a/modules/monitoring/application/views/scripts/host/history.phtml b/modules/monitoring/application/views/scripts/host/history.phtml
new file mode 100644
index 000000000..829d46fac
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/host/history.phtml
@@ -0,0 +1,169 @@
+<?php
+use Icinga\Module\Monitoring\Object\Host;
+use Icinga\Module\Monitoring\Object\Service;
+
+$self = $this;
+
+if (! $this->compact): ?>
+<div class="controls">
+  <?= $this->tabs; ?>
+  <?= $this->render('partials/host/object-header.phtml'); ?>
+  <h1><?= $this->translate('This Host\'s Event History'); ?></h1>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php
+
+if (count($history) === 0) {
+    echo $this->translate('No history events found matching the filter') . '</div>';
+    return;
+}
+?>
+
+<?php
+function contactsLink($match, $view) {
+    $links = array();
+    foreach (preg_split('/,\s/', $match[1]) as $contact) {
+        $links[] = $view->qlink(
+            $contact,
+            'monitoring/show/contact',
+            array('contact_name' => $contact),
+            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
+        );
+    }
+    return '[' . implode(', ', $links) . ']';
+}
+?>
+
+  <table data-base-target="_next" class="action objecthistory">
+    <tbody>
+    <?php foreach ($history as $event): ?>
+    <?php
+      $stateClass = 'invalid';
+      $isService = isset($event->service_description);
+      switch ($event->type) {
+        case 'notify':
+          $icon = 'notification';
+          $title = $this->translate('Notification');
+          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+
+          $msg = preg_replace_callback(
+              '/^\[([^\]]+)\]/',
+              function($match) use ($self) { return contactsLink($match, $self); },
+              $this->escape($event->output)
+          );
+          break;
+        case 'comment':
+          $icon = 'comment';
+          $title = $this->translate('Comment');
+          $msg = $this->escape($event->output);
+          break;
+        case 'comment_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Comment deleted');
+          $msg = $this->escape($event->output);
+          break;
+        case 'ack':
+          $icon = 'acknowledgement';
+          $title = $this->translate('Acknowledge');
+          $msg = $this->escape($event->output);
+          break;
+        case 'ack_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Ack removed');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_comment':
+          $icon = 'in_downtime';
+          $title = $this->translate('In Downtime');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_comment_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Downtime removed');
+          $msg = $this->escape($event->output);
+          break;
+        case 'flapping':
+          $icon = 'flapping';
+          $title = $this->translate('Flapping');
+          $msg = $this->escape($event->output);
+          break;
+        case 'flapping_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Flapping stopped');
+          $msg = $this->escape($event->output);
+          break;
+        case 'hard_state':
+          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
+          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+          $icon = 'attention-alt';
+          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+          break;
+        case 'soft_state':
+          $icon = 'spinner';
+          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
+          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
+          break;
+        case 'dt_start':
+          $icon = 'downtime_start';
+          $title = $this->translate('Downtime Start');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_end':
+          $icon = 'downtime_end';
+          $title = $this->translate('Downtime End');
+          $msg = $this->escape($event->output);
+          break;
+      }
+    ?>
+      <tr class="state <?= $stateClass; ?>">
+        <td class="state">
+          <strong><?= $this->escape($title); ?></strong>
+          <br>
+          <?= date('d.m. H:i', $event->timestamp); ?>
+        </td>
+        <td><?php
+
+$output = $this->tickets ? preg_replace_callback(
+    $this->tickets->getPattern(),
+    array($this->tickets, 'createLink'),
+    $msg
+) : $msg;
+
+?>
+        <?php if ($isService): ?>
+          <?= sprintf(
+              $this->translate('%s on %s', 'Service running on host'),
+              $this->qlink(
+                  $event->service_display_name,
+                  'monitoring/show/service',
+                  array(
+                      'host' => $event->host_name,
+                      'service' => $event->service_description
+                  ),
+                  array('title' => sprintf(
+                      $this->translate('Show detailed information for service %s on host %s'),
+                      $event->service_display_name,
+                      $event->host_display_name
+                  ))
+              ),
+              $event->host_display_name
+          ) ?>
+        <?php else: ?>
+          <?= $this->escape($event->host_name); ?>
+        <?php endif ?>
+          <br>
+          <div>
+            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+          </div>
+        </td>
+      </tr>
+<?php endforeach; ?>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/service/history.phtml b/modules/monitoring/application/views/scripts/service/history.phtml
new file mode 100644
index 000000000..dd6a0b3d9
--- /dev/null
+++ b/modules/monitoring/application/views/scripts/service/history.phtml
@@ -0,0 +1,151 @@
+<?php
+use Icinga\Module\Monitoring\Object\Service;
+
+$self = $this;
+
+if (! $this->compact): ?>
+<div class="controls">
+  <?= $this->tabs; ?>
+  <?= $this->render('partials/service/object-header.phtml'); ?>
+  <h1><?= $this->translate('This Service\'s Event History'); ?></h1>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
+</div>
+<?php endif ?>
+<div class="content">
+<?php
+
+if (count($history) === 0) {
+    echo $this->translate('No history events found matching the filter') . '</div>';
+    return;
+}
+?>
+
+<?php
+function contactsLink($match, $view) {
+    $links = array();
+    foreach (preg_split('/,\s/', $match[1]) as $contact) {
+        $links[] = $view->qlink(
+            $contact,
+            'monitoring/show/contact',
+            array('contact_name' => $contact),
+            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
+        );
+    }
+    return '[' . implode(', ', $links) . ']';
+}
+?>
+
+  <table data-base-target="_next" class="action objecthistory">
+    <tbody>
+    <?php foreach ($history as $event): ?>
+    <?php
+      $stateClass = 'invalid';
+      switch ($event->type) {
+        case 'notify':
+          $icon = 'notification';
+          $title = $this->translate('Notification');
+          $stateClass = Service::getStateText($event->state);
+
+          $msg = preg_replace_callback(
+              '/^\[([^\]]+)\]/',
+              function($match) use ($self) { return contactsLink($match, $self); },
+              $this->escape($event->output)
+          );
+          break;
+        case 'comment':
+          $icon = 'comment';
+          $title = $this->translate('Comment');
+          $msg = $this->escape($event->output);
+          break;
+        case 'comment_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Comment deleted');
+          $msg = $this->escape($event->output);
+          break;
+        case 'ack':
+          $icon = 'acknowledgement';
+          $title = $this->translate('Acknowledge');
+          $msg = $this->escape($event->output);
+          break;
+        case 'ack_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Ack removed');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_comment':
+          $icon = 'in_downtime';
+          $title = $this->translate('In Downtime');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_comment_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Downtime removed');
+          $msg = $this->escape($event->output);
+          break;
+        case 'flapping':
+          $icon = 'flapping';
+          $title = $this->translate('Flapping');
+          $msg = $this->escape($event->output);
+          break;
+        case 'flapping_deleted':
+          $icon = 'remove';
+          $title = $this->translate('Flapping stopped');
+          $msg = $this->escape($event->output);
+          break;
+        case 'hard_state':
+          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
+          $stateClass = Service::getStateText($event->state);
+          $icon = 'attention-alt';
+          $title = Service::getStateText($event->state);
+          break;
+        case 'soft_state':
+          $icon = 'spinner';
+          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
+          $stateClass = Service::getStateText($event->state);
+          $title = Service::getStateText($event->state);
+          break;
+        case 'dt_start':
+          $icon = 'downtime_start';
+          $title = $this->translate('Downtime Start');
+          $msg = $this->escape($event->output);
+          break;
+        case 'dt_end':
+          $icon = 'downtime_end';
+          $title = $this->translate('Downtime End');
+          $msg = $this->escape($event->output);
+          break;
+      }
+    ?>
+      <tr class="state <?= $stateClass; ?>">
+        <td class="state">
+          <strong><?= $this->escape($title); ?></strong>
+          <br>
+          <?= date('d.m. H:i', $event->timestamp); ?>
+        </td>
+        <td><?php
+
+$output = $this->tickets ? preg_replace_callback(
+    $this->tickets->getPattern(),
+    array($this->tickets, 'createLink'),
+    $msg
+) : $msg;
+
+?>
+          <?= sprintf(
+              $this->translate('%s on %s', 'Service running on host'),
+              $this->escape($event->service_display_name),
+              $event->host_display_name
+          ) ?>
+          <br>
+          <div>
+            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
+          </div>
+        </td>
+      </tr>
+<?php endforeach; ?>
+    </tbody>
+  </table>
+</div>
\ No newline at end of file
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index 0b1cda923..8879a40ea 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -93,6 +93,19 @@ abstract class MonitoredObjectController extends Controller
         $this->view->object = $this->object;
     }
 
+    /**
+     * Show the history for a host or service
+     */
+    public function historyAction()
+    {
+        $this->getTabs()->activate('history');
+        $this->view->history = $this->object->fetchEventHistory()->eventhistory;
+
+        $this->setupLimitControl(50);
+        $this->setupPaginationControl($this->view->history, 50);
+        $this->view->object = $this->object;
+    }
+
     /**
      * Handle a command form
      *
@@ -211,7 +224,7 @@ abstract class MonitoredObjectController extends Controller
                     ,
                     'label'     => $this->translate('History'),
                     'icon'      => 'rewind',
-                    'url'       => 'monitoring/show/history',
+                    'url'       => $isService ? 'monitoring/service/history' : 'monitoring/host/history',
                     'urlParams' => $params
                 )
             );

From 71e932bcf91c996ea4f2ea5545b64116faefb2fd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Tue, 16 Jun 2015 17:05:41 +0200
Subject: [PATCH 18/24] ShowController: Deprecate historyAction

---
 .../controllers/ShowController.php            | 155 +---------------
 .../views/scripts/show/history.phtml          | 174 ------------------
 2 files changed, 7 insertions(+), 322 deletions(-)
 delete mode 100644 modules/monitoring/application/views/scripts/show/history.phtml

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 60f2b186f..2321e0f82 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -1,12 +1,7 @@
 <?php
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
-use Icinga\Module\Monitoring\Object\MonitoredObject;
-use Icinga\Web\Hook;
 use Icinga\Web\Url;
-use Icinga\Web\Widget\Tabs;
-use Icinga\Web\Widget\Tabextension\OutputFormat;
-use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Controller;
 
@@ -22,34 +17,6 @@ class Monitoring_ShowController extends Controller
      */
     protected $backend;
 
-    /**
-     * @var Hook\GrapherHook
-     */
-    protected $grapher;
-
-    /**
-     * Initialize the controller
-     */
-    public function init()
-    {
-        $this->view->object = MonitoredObject::fromParams($this->params);
-        if ($this->view->object && $this->view->object->fetch() === false) {
-            throw new Zend_Controller_Action_Exception($this->translate('Host or service not found'));
-        }
-
-        if (Hook::has('ticket')) {
-            $this->view->tickets = Hook::first('ticket');
-        }
-        if (Hook::has('grapher')) {
-            $this->grapher = Hook::first('grapher');
-            if ($this->grapher && ! $this->grapher->hasPreviews()) {
-                $this->grapher = null;
-            }
-        }
-
-        $this->createTabs();
-    }
-
     /**
      * @deprecated
      */
@@ -66,37 +33,16 @@ class Monitoring_ShowController extends Controller
         $this->redirectNow(Url::fromRequest()->setPath('monitoring/host/show'));
     }
 
+    /**
+     * @deprecated
+     */
     public function historyAction()
     {
-        $this->getTabs()->activate('history');
-        $this->view->object->fetchEventHistory();
-        $this->view->history = $this->view->object->eventhistory;
-        $this->handleFormatRequest($this->view->object->eventhistory);
-        $this->fetchHostStats();
+        if ($this->params->has('service')) {
+            $this->redirectNow(Url::fromRequest()->setPath('monitoring/service/history'));
+        }
 
-        $this->setupLimitControl(50);
-        $this->setupPaginationControl($this->view->history, 50);
-    }
-
-    protected function fetchHostStats()
-    {
-        $this->view->stats = $this->backend->select()->from('statusSummary', array(
-            'services_total',
-            'services_ok',
-            'services_problem',
-            'services_problem_handled',
-            'services_problem_unhandled',
-            'services_critical',
-            'services_critical_unhandled',
-            'services_critical_handled',
-            'services_warning',
-            'services_warning_unhandled',
-            'services_warning_handled',
-            'services_unknown',
-            'services_unknown_unhandled',
-            'services_unknown_handled',
-            'services_pending',
-        ))->where('service_host_name', $this->params->get('host'))->getQuery()->fetchRow();
+        $this->redirectNow(Url::fromRequest()->setPath('monitoring/host/history'));
     }
 
     public function contactAction()
@@ -162,91 +108,4 @@ class Monitoring_ShowController extends Controller
         $this->view->contact = $contact;
         $this->view->contactName = $contactName;
     }
-
-    /**
-     * Creating tabs for this controller
-     * @return Tabs
-     */
-    protected function createTabs()
-    {
-        if (($object = $this->view->object) === null) {
-            return;
-        }
-        if ($object->getType() === $object::TYPE_HOST) {
-            $isService = false;
-            $params = array(
-                'host' => $object->getName()
-            );
-        } else {
-            $isService = true;
-            $params = array(
-                'host'      => $object->getHost()->getName(),
-                'service'   => $object->getName()
-            );
-        }
-        $tabs = $this->getTabs();
-        $tabs->add(
-            'host',
-            array(
-                'title'     => sprintf(
-                    $this->translate('Show detailed information for host %s'),
-                    $isService ? $object->getHost()->getName() : $object->getName()
-                ),
-                'label'     => $this->translate('Host'),
-                'icon'      => 'host',
-                'url'       => 'monitoring/show/host',
-                'urlParams' => $params,
-            )
-        );
-        if ($isService) {
-            $tabs->add(
-                'service',
-                array(
-                    'title'     => sprintf(
-                        $this->translate('Show detailed information for service %s on host %s'),
-                        $object->getName(),
-                        $object->getHost()->getName()
-                    ),
-                    'label'     => $this->translate('Service'),
-                    'icon'      => 'service',
-                    'url'       => 'monitoring/show/service',
-                    'urlParams' => $params,
-                )
-            );
-        }
-        $tabs->add(
-            'services',
-            array(
-                'title'     => sprintf(
-                    $this->translate('List all services on host %s'),
-                    $isService ? $object->getHost()->getName() : $object->getName()
-                ),
-                'label'     => $this->translate('Services'),
-                'icon'      => 'services',
-                'url'       => 'monitoring/host/services',
-                'urlParams' => $params,
-            )
-        );
-        if ($this->backend->hasQuery('eventHistory')) {
-            $tabs->add(
-                'history',
-                array(
-                    'title'     => $isService
-                        ? sprintf(
-                            $this->translate('Show all event records of service %s on host %s'),
-                            $object->getName(),
-                            $object->getHost()->getName()
-                        )
-                        : sprintf($this->translate('Show all event records of host %s'), $object->getName())
-                    ,
-                    'label'     => $this->translate('History'),
-                    'icon'      => 'rewind',
-                    'url'       => 'monitoring/show/history',
-                    'urlParams' => $params,
-                )
-            );
-        }
-        $tabs->extend(new OutputFormat())
-            ->extend(new DashboardAction());
-    }
 }
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
deleted file mode 100644
index 3777d0384..000000000
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-use Icinga\Module\Monitoring\Object\Host;
-use Icinga\Module\Monitoring\Object\Service;
-
-$self = $this;
-$hostContext = $object->getType() === 'host';
-
-if (! $this->compact): ?>
-<div class="controls">
-  <?= $this->tabs; ?>
- <?php if ($hostContext): ?>
-  <?= $this->render('partials/host/object-header.phtml'); ?>
- <?php else: ?>
-  <?= $this->render('partials/service/object-header.phtml'); ?>
- <?php endif ?>
-  <h1><?= $this->translate('This Object\'s Event History'); ?></h1>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
-</div>
-<?php endif ?>
-<div class="content">
-<?php
-
-if (count($history) === 0) {
-    echo $this->translate('No history available for this object') . '</div>';
-    return;
-}
-?>
-
-<?php
-function contactsLink($match, $view) {
-    $links = array();
-    foreach (preg_split('/,\s/', $match[1]) as $contact) {
-        $links[] = $view->qlink(
-            $contact,
-            'monitoring/show/contact',
-            array('contact_name' => $contact),
-            array('title' => sprintf($view->translate('Show detailed information about %s'), $contact))
-        );
-    }
-    return '[' . implode(', ', $links) . ']';
-}
-?>
-
-  <table data-base-target="_next" class="action objecthistory">
-    <tbody>
-    <?php foreach ($history as $event): ?>
-    <?php
-      $stateClass = 'invalid';
-      $isService = isset($event->service_description);
-      switch ($event->type) {
-        case 'notify':
-          $icon = 'notification';
-          $title = $this->translate('Notification');
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-
-          $msg = preg_replace_callback(
-              '/^\[([^\]]+)\]/',
-              function($match) use ($self) { return contactsLink($match, $self); },
-              $this->escape($event->output)
-          );
-          break;
-        case 'comment':
-          $icon = 'comment';
-          $title = $this->translate('Comment');
-          $msg = $this->escape($event->output);
-          break;
-        case 'comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Comment deleted');
-          $msg = $this->escape($event->output);
-          break;
-        case 'ack':
-          $icon = 'acknowledgement';
-          $title = $this->translate('Acknowledge');
-          $msg = $this->escape($event->output);
-          break;
-        case 'ack_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Ack removed');
-          $msg = $this->escape($event->output);
-          break;
-        case 'dt_comment':
-          $icon = 'in_downtime';
-          $title = $this->translate('In Downtime');
-          $msg = $this->escape($event->output);
-          break;
-        case 'dt_comment_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Downtime removed');
-          $msg = $this->escape($event->output);
-          break;
-        case 'flapping':
-          $icon = 'flapping';
-          $title = $this->translate('Flapping');
-          $msg = $this->escape($event->output);
-          break;
-        case 'flapping_deleted':
-          $icon = 'remove';
-          $title = $this->translate('Flapping stopped');
-          $msg = $this->escape($event->output);
-          break;
-        case 'hard_state':
-          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $icon = 'attention-alt';
-          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          break;
-        case 'soft_state':
-          $icon = 'spinner';
-          $msg = '[ ' . $event->attempt . '/' . $event->max_attempts . ' ] ' . $this->escape($event->output);
-          $stateClass = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          $title = $isService ? Service::getStateText($event->state) : Host::getStateText($event->state);
-          break;
-        case 'dt_start':
-          $icon = 'downtime_start';
-          $title = $this->translate('Downtime Start');
-          $msg = $this->escape($event->output);
-          break;
-        case 'dt_end':
-          $icon = 'downtime_end';
-          $title = $this->translate('Downtime End');
-          $msg = $this->escape($event->output);
-          break;
-      }
-    ?>
-      <tr class="state <?= $stateClass; ?>">
-        <td class="state">
-          <strong><?= $this->escape($title); ?></strong>
-          <br>
-          <?= date('d.m. H:i', $event->timestamp); ?>
-        </td>
-        <td><?php
-
-$output = $this->tickets ? preg_replace_callback(
-    $this->tickets->getPattern(),
-    array($this->tickets, 'createLink'),
-    $msg
-) : $msg;
-
-?>
-        <?php if ($isService): ?>
-          <?= sprintf(
-              $this->translate('%s on %s', 'Service running on host'),
-              $hostContext ? $this->qlink(
-                  $event->service_display_name,
-                  'monitoring/show/service',
-                  array(
-                      'host' => $event->host_name,
-                      'service' => $event->service_description
-                  ),
-                  array('title' => sprintf(
-                      $this->translate('Show detailed information for service %s on host %s'),
-                      $event->service_display_name,
-                      $event->host_display_name
-                  ))
-              ) : $this->escape($event->service_display_name),
-              $event->host_display_name
-          ) ?>
-        <?php else: ?>
-          <?= $this->escape($event->host_name); ?>
-        <?php endif ?>
-          <br>
-          <div>
-            <?= $this->icon($icon, $title); ?> <?= empty($msg) ? '' : $msg; ?>
-          </div>
-        </td>
-      </tr>
-<?php endforeach; ?>
-    </tbody>
-  </table>
-</div>

From f31f18dc5192bd70d412663d048741234adb77ae Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 16 Jun 2015 17:54:21 +0200
Subject: [PATCH 19/24] Move security documentation for monitoring module into
 correct directory

refs #9377
---
 modules/{doc => monitoring}/doc/security.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename modules/{doc => monitoring}/doc/security.md (100%)

diff --git a/modules/doc/doc/security.md b/modules/monitoring/doc/security.md
similarity index 100%
rename from modules/doc/doc/security.md
rename to modules/monitoring/doc/security.md

From 36622101ae7c41b3b5b7eca2afe266466b99c34d Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Tue, 16 Jun 2015 18:36:12 +0200
Subject: [PATCH 20/24] Use built-in php sort functions

refs #8205
---
 .../application/views/helpers/Perfdata.php      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/modules/monitoring/application/views/helpers/Perfdata.php b/modules/monitoring/application/views/helpers/Perfdata.php
index 1ff59b6ae..aaf6b3fee 100644
--- a/modules/monitoring/application/views/helpers/Perfdata.php
+++ b/modules/monitoring/application/views/helpers/Perfdata.php
@@ -19,19 +19,12 @@ class Zend_View_Helper_Perfdata extends Zend_View_Helper_Abstract
     public function perfdata($perfdataStr, $compact = false, $limit = 0, $color = Perfdata::PERFDATA_OK)
     {
         $pieChartData = PerfdataSet::fromString($perfdataStr)->asArray();
-
-        if (1 < ($i = count($pieChartData))) {
-            while (--$i) {
-                for ($j = 0, $k = 1; $j < $i; ++$j, ++$k) {
-                    if ($pieChartData[$k]->worseThan($pieChartData[$j])) {
-                        $perfdata = $pieChartData[$k];
-                        $pieChartData[$k] = $pieChartData[$j];
-                        $pieChartData[$j] = $perfdata;
-                    }
-                }
+        uasort(
+            $pieChartData,
+            function($a, $b) {
+                return $a->worseThan($b) ? -1 : ($b->worseThan($a) ? 1 : 0);
             }
-        }
-
+        );
         $results = array();
         $table = array(
             '<td><b>' . implode(

From 0d32b94eaa4854a13aef012fae1c8e76aed4af72 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 10:24:18 +0200
Subject: [PATCH 21/24] HostController: Open a host's service in the current
 column

---
 .../monitoring/application/views/scripts/host/services.phtml   | 3 ++-
 .../monitoring/application/views/scripts/list/services.phtml   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/host/services.phtml b/modules/monitoring/application/views/scripts/host/services.phtml
index ca12f3d0e..11166f8fa 100644
--- a/modules/monitoring/application/views/scripts/host/services.phtml
+++ b/modules/monitoring/application/views/scripts/host/services.phtml
@@ -12,6 +12,7 @@
     'compact'       => true,
     'showHost'      => false,
     'services'      => $services,
-    'addColumns'    => array()
+    'addColumns'    => array(),
+    'baseTarget'    => '_self'
   )
 ); ?>
\ No newline at end of file
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index c9dae8332..f3b28bb5e 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -25,7 +25,7 @@ if (count($services) === 0) {
     return;
 }
 ?>
-<table data-base-target="_next"
+<table data-base-target="<?= isset($baseTarget) ? $baseTarget : '_next'; ?>"
     class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
     data-icinga-multiselect-url="<?= $this->href("monitoring/services/show") ?>"
     data-icinga-multiselect-data="service,host">

From 31406a70bcfd1f28f643a3bb02194b4ba5229659 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 12:54:36 +0200
Subject: [PATCH 22/24] Show a small border above the first notification

Looks better, somehow..

refs #8247
---
 public/css/icinga/main-content.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 6f15533cc..24297b991 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -28,6 +28,10 @@ img.icon {
 #notifications {
   margin: 0;
   padding: 0;
+
+  li:first-child {
+    border-top: 2px solid @colorPetrol;
+  }
 }
 
 #notifications > li {

From 858c015d4cc3cedd06ea0c4c26d093d89bfdce90 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 13:37:11 +0200
Subject: [PATCH 23/24] Move notification related css into
 footer-elements.less..

..and fix the border and z-index.
---
 public/css/icinga/footer-elements.less | 38 ++++++++++++++++++++++++
 public/css/icinga/main-content.less    | 41 --------------------------
 2 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/public/css/icinga/footer-elements.less b/public/css/icinga/footer-elements.less
index a9d513103..d9c49f100 100644
--- a/public/css/icinga/footer-elements.less
+++ b/public/css/icinga/footer-elements.less
@@ -5,4 +5,42 @@ div#footer {
   left: 0px;
   right: 0px;
   bottom: 0px;
+  z-index: 9999;
 }
+
+/** Notifications **/
+
+#notifications {
+  margin: 0;
+  padding: 0;
+}
+
+#notifications > li {
+  list-style-type: none;
+  display: block;
+  border-top: 1px solid #999;
+  color: white;
+  line-height: 2.5em;
+  padding-left: 3em;
+  background-repeat: no-repeat;
+  background-position: 1em center;
+}
+
+#notifications > li.info {
+  background-color: @colorFormNotificationInfo;
+}
+
+#notifications > li.warning {
+  background-color: @colorWarningHandled;
+}
+#notifications > li.error {
+  background-color: @colorCritical;
+  background-image: url(../img/icons/error_white.png);
+}
+
+#notifications > li.success {
+  background-color: #fe6;
+  background-image: url(../img/icons/success.png);
+  color: #333;
+}
+/** END of Notifications **/
diff --git a/public/css/icinga/main-content.less b/public/css/icinga/main-content.less
index 24297b991..635c1628f 100644
--- a/public/css/icinga/main-content.less
+++ b/public/css/icinga/main-content.less
@@ -23,47 +23,6 @@ img.icon {
   border: none;
 }
 
-/** Notifications **/
-
-#notifications {
-  margin: 0;
-  padding: 0;
-
-  li:first-child {
-    border-top: 2px solid @colorPetrol;
-  }
-}
-
-#notifications > li {
-  list-style-type: none;
-  display: block;
-  border-bottom: 1px solid #999;
-  color: white;
-  line-height: 2.5em;
-  padding-left: 3em;
-  background-repeat: no-repeat;
-  background-position: 1em center;
-}
-
-#notifications > li.info {
-  background-color: @colorFormNotificationInfo;
-}
-
-#notifications > li.warning {
-  background-color: @colorWarningHandled;
-}
-#notifications > li.error {
-  background-color: @colorCritical;
-  background-image: url(../img/icons/error_white.png);
-}
-
-#notifications > li.success {
-  background-color: #fe6;
-  background-image: url(../img/icons/success.png);
-  color: #333;
-}
-/** END of Notifications **/
-
 /* TODO: Remove once there is no more module container */
 .container > div > pre {
   margin: 1em;

From b54bf3540294e0890b4bea32b4af86274c91648f Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Wed, 17 Jun 2015 13:43:59 +0200
Subject: [PATCH 24/24] ConfigController: Do not use forward() but
 redirectNow()

fixes #9349
---
 application/controllers/ConfigController.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/controllers/ConfigController.php b/application/controllers/ConfigController.php
index 9d55910e9..0f3d7d1ed 100644
--- a/application/controllers/ConfigController.php
+++ b/application/controllers/ConfigController.php
@@ -86,12 +86,8 @@ class ConfigController extends Controller
         if ($this->firstAllowedAction === null) {
             throw new SecurityException($this->translate('No permission for application configuration'));
         }
-        $action = $this->getTabs()->get($this->firstAllowedAction);
-        if (substr($action->getUrl()->getPath(), 0, 7) === 'config/') {
-            $this->forward($this->firstAllowedAction);
-        } else {
-            $this->redirectNow($action->getUrl());
-        }
+
+        $this->redirectNow($this->getTabs()->get($this->firstAllowedAction)->getUrl());
     }
 
     /**